Normalise whitespace.

2010-06-03 Andrew John Hughes <ahughes@redhat.com> * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java, * examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Player.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java, * examples/gnu/classpath/examples/CORBA/swing/x5/State.java, * examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java, * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java, * examples/gnu/classpath/examples/awt/Demo.java, * examples/gnu/classpath/examples/awt/HintingDemo.java, * examples/gnu/classpath/examples/datatransfer/Demo.java, * examples/gnu/classpath/examples/html/Demo.java, * examples/gnu/classpath/examples/java2d/J2dBenchmark.java, * examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java, * examples/gnu/classpath/examples/java2d/JNIOverhead.java, * examples/gnu/classpath/examples/jawt/DemoJAWT.java, * examples/gnu/classpath/examples/management/TestClassLoading.java, * examples/gnu/classpath/examples/management/TestCompilation.java, * examples/gnu/classpath/examples/management/TestGarbageCollector.java, * examples/gnu/classpath/examples/management/TestMemory.java, * examples/gnu/classpath/examples/management/TestMemoryManager.java, * examples/gnu/classpath/examples/management/TestMemoryPool.java, * examples/gnu/classpath/examples/management/TestThread.java, * examples/gnu/classpath/examples/midi/Demo.java, * examples/gnu/classpath/examples/print/Demo.java, * examples/gnu/classpath/examples/sound/AudioPlayerSample.java, * examples/gnu/classpath/examples/swing/BrowserEditorKit.java, * examples/gnu/classpath/examples/swing/ButtonDemo.java, * examples/gnu/classpath/examples/swing/ComboBoxDemo.java, * examples/gnu/classpath/examples/swing/Demo.java, * examples/gnu/classpath/examples/swing/DemoFactory.java, * examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, * examples/gnu/classpath/examples/swing/FileChooserDemo.java, * examples/gnu/classpath/examples/swing/HtmlDemo.java, * examples/gnu/classpath/examples/swing/ListDemo.java, * examples/gnu/classpath/examples/swing/MetalThemeEditor.java, * examples/gnu/classpath/examples/swing/NavigationFilterDemo.java, * examples/gnu/classpath/examples/swing/ScrollBarDemo.java, * examples/gnu/classpath/examples/swing/SliderDemo.java, * examples/gnu/classpath/examples/swing/SpinnerDemo.java, * examples/gnu/classpath/examples/swing/TabbedPaneDemo.java, * examples/gnu/classpath/examples/swing/TableDemo.java, * examples/gnu/classpath/examples/swing/TextAreaDemo.java, * examples/gnu/classpath/examples/swing/TextFieldDemo.java, * examples/gnu/classpath/examples/swing/TreeDemo.java, * 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/
author: Andrew John Hughes <gnu_andrew@member.fsf.org> 2010-06-03 19:11:10 +0000
committer: Andrew John Hughes <gnu_andrew@member.fsf.org> 2010-06-03 19:11:10 +0000
commit: a17284098845d59d84bbf76b33190a5a91c12a82 (patch)
tree: c634c40062604cd1cdefa535b838926c9ede1a38 /tools
parent: 43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download: classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz
349 files changed, 5428 insertions, 5460 deletions
diff --git a/tools/com/sun/javadoc/ClassDoc.java b/tools/com/sun/javadoc/ClassDoc.java
index a4fa40a7c..6309f9472 100644
--- a/tools/com/sun/javadoc/ClassDoc.java
+++ b/tools/com/sun/javadoc/ClassDoc.java
@@ -319,4 +319,3 @@ TypeVariable[]
 typeParameters();
 
 } // interface ClassDoc
-
diff --git a/tools/com/sun/javadoc/ConstructorDoc.java b/tools/com/sun/javadoc/ConstructorDoc.java
index e9db4591c..88c8d3ddb 100644
--- a/tools/com/sun/javadoc/ConstructorDoc.java
+++ b/tools/com/sun/javadoc/ConstructorDoc.java
@@ -54,4 +54,3 @@ public abstract String
 qualifiedName();
 
 } // interface ConstructorDoc
-
diff --git a/tools/com/sun/javadoc/Doc.java b/tools/com/sun/javadoc/Doc.java
index 425c85718..554720d69 100644
--- a/tools/com/sun/javadoc/Doc.java
+++ b/tools/com/sun/javadoc/Doc.java
@@ -262,4 +262,3 @@ public abstract SourcePosition
 position();
 
 } // interface Doc
-
diff --git a/tools/com/sun/javadoc/DocErrorReporter.java b/tools/com/sun/javadoc/DocErrorReporter.java
index c4d05e700..2e801b848 100644
--- a/tools/com/sun/javadoc/DocErrorReporter.java
+++ b/tools/com/sun/javadoc/DocErrorReporter.java
@@ -74,4 +74,3 @@ public abstract void
 printNotice(String notice);
 
 } // interface DocErrorReporter
-
diff --git a/tools/com/sun/javadoc/Doclet.java b/tools/com/sun/javadoc/Doclet.java
index 7ce4b29ef..172387ebb 100644
--- a/tools/com/sun/javadoc/Doclet.java
+++ b/tools/com/sun/javadoc/Doclet.java
@@ -96,4 +96,3 @@ validOptions(String[][] opts, DocErrorReporter logger)
 }
 
 } // class Doclet
-
diff --git a/tools/com/sun/javadoc/ExecutableMemberDoc.java b/tools/com/sun/javadoc/ExecutableMemberDoc.java
index 8d4ddab66..ac0ca06f7 100644
--- a/tools/com/sun/javadoc/ExecutableMemberDoc.java
+++ b/tools/com/sun/javadoc/ExecutableMemberDoc.java
@@ -135,4 +135,3 @@ public abstract String
 flatSignature();
 
 } // interface ExecutableMemberDoc
-
diff --git a/tools/com/sun/javadoc/FieldDoc.java b/tools/com/sun/javadoc/FieldDoc.java
index a5e48c4c1..1fd0c7b83 100644
--- a/tools/com/sun/javadoc/FieldDoc.java
+++ b/tools/com/sun/javadoc/FieldDoc.java
@@ -110,4 +110,3 @@ constantValueExpression();
 
 
 } // interface FieldDoc
-
diff --git a/tools/com/sun/javadoc/MemberDoc.java b/tools/com/sun/javadoc/MemberDoc.java
index 8448f12c5..9e755bbd6 100644
--- a/tools/com/sun/javadoc/MemberDoc.java
+++ b/tools/com/sun/javadoc/MemberDoc.java
@@ -57,4 +57,3 @@ public abstract boolean
 isSynthetic();
 
 } // interface MemberDoc
-
diff --git a/tools/com/sun/javadoc/MethodDoc.java b/tools/com/sun/javadoc/MethodDoc.java
index a24b8ec09..87129ef44 100644
--- a/tools/com/sun/javadoc/MethodDoc.java
+++ b/tools/com/sun/javadoc/MethodDoc.java
@@ -77,4 +77,3 @@ public abstract ClassDoc
 overriddenClass();
 
 } // interface MethodDoc
-
diff --git a/tools/com/sun/javadoc/PackageDoc.java b/tools/com/sun/javadoc/PackageDoc.java
index d544acf5b..4518b4eba 100644
--- a/tools/com/sun/javadoc/PackageDoc.java
+++ b/tools/com/sun/javadoc/PackageDoc.java
@@ -106,4 +106,3 @@ public abstract ClassDoc
 findClass(String cls);
 
 } // interface PackageDoc
-
diff --git a/tools/com/sun/javadoc/ParamTag.java b/tools/com/sun/javadoc/ParamTag.java
index 94358637e..9c060e901 100644
--- a/tools/com/sun/javadoc/ParamTag.java
+++ b/tools/com/sun/javadoc/ParamTag.java
@@ -63,4 +63,3 @@ public abstract String
 parameterName();
 
 } // interface ParamTag
-
diff --git a/tools/com/sun/javadoc/Parameter.java b/tools/com/sun/javadoc/Parameter.java
index a359a5d9e..300a3355a 100644
--- a/tools/com/sun/javadoc/Parameter.java
+++ b/tools/com/sun/javadoc/Parameter.java
@@ -85,4 +85,3 @@ public abstract String
 toString();
 
 } // interaface Parameter
-
diff --git a/tools/com/sun/javadoc/ProgramElementDoc.java b/tools/com/sun/javadoc/ProgramElementDoc.java
index 0d6dd4640..061e327e1 100644
--- a/tools/com/sun/javadoc/ProgramElementDoc.java
+++ b/tools/com/sun/javadoc/ProgramElementDoc.java
@@ -167,4 +167,3 @@ public abstract boolean
 isFinal();
 
 } // interface ProgramElementDoc
-
diff --git a/tools/com/sun/javadoc/RootDoc.java b/tools/com/sun/javadoc/RootDoc.java
index 064215408..18be71dde 100644
--- a/tools/com/sun/javadoc/RootDoc.java
+++ b/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/tools/com/sun/javadoc/SeeTag.java b/tools/com/sun/javadoc/SeeTag.java
index 12a2e934b..7e5b305ae 100644
--- a/tools/com/sun/javadoc/SeeTag.java
+++ b/tools/com/sun/javadoc/SeeTag.java
@@ -106,4 +106,3 @@ public abstract MemberDoc
 referencedMember();
 
 } // interface SeeTag
-
diff --git a/tools/com/sun/javadoc/SerialFieldTag.java b/tools/com/sun/javadoc/SerialFieldTag.java
index 9f5fa9acc..ef692834c 100644
--- a/tools/com/sun/javadoc/SerialFieldTag.java
+++ b/tools/com/sun/javadoc/SerialFieldTag.java
@@ -99,4 +99,3 @@ public abstract int
 compareTo(Object obj);
 
 } // interface SerialFieldTag
-
diff --git a/tools/com/sun/javadoc/Tag.java b/tools/com/sun/javadoc/Tag.java
index f03221273..88745cb98 100644
--- a/tools/com/sun/javadoc/Tag.java
+++ b/tools/com/sun/javadoc/Tag.java
@@ -104,4 +104,3 @@ public abstract Tag[]
 firstSentenceTags();
 
 } // interface Tag
-
diff --git a/tools/com/sun/javadoc/ThrowsTag.java b/tools/com/sun/javadoc/ThrowsTag.java
index 72a43949e..0d5a98e85 100644
--- a/tools/com/sun/javadoc/ThrowsTag.java
+++ b/tools/com/sun/javadoc/ThrowsTag.java
@@ -73,4 +73,3 @@ public abstract ClassDoc
 exception();
 
 } // interface ThrowsTag
-
diff --git a/tools/com/sun/javadoc/Type.java b/tools/com/sun/javadoc/Type.java
index 8d0bd145c..0aabe0e78 100644
--- a/tools/com/sun/javadoc/Type.java
+++ b/tools/com/sun/javadoc/Type.java
@@ -117,4 +117,3 @@ TypeVariable
 asTypeVariable();
 
 } // interface Type
-
diff --git a/tools/com/sun/javadoc/TypeVariable.java b/tools/com/sun/javadoc/TypeVariable.java
index 4f847d26b..94da50507 100644
--- a/tools/com/sun/javadoc/TypeVariable.java
+++ b/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/tools/com/sun/tools/javadoc/Main.java b/tools/com/sun/tools/javadoc/Main.java
index 7f0fc1088..0082d411e 100644
--- a/tools/com/sun/tools/javadoc/Main.java
+++ b/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/tools/com/sun/tools/javah/Main.java b/tools/com/sun/tools/javah/Main.java
index 7eb0f37a8..7faab594e 100644
--- a/tools/com/sun/tools/javah/Main.java
+++ b/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/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java b/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java
index 8226ae8cd..835b3e0ca 100644
--- a/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/AnnotationWriter.java b/tools/external/asm/org/objectweb/asm/AnnotationWriter.java
index 918e23419..bf06bc95b 100644
--- a/tools/external/asm/org/objectweb/asm/AnnotationWriter.java
+++ b/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/tools/external/asm/org/objectweb/asm/Attribute.java b/tools/external/asm/org/objectweb/asm/Attribute.java
index c55eb9324..897a33c79 100644
--- a/tools/external/asm/org/objectweb/asm/Attribute.java
+++ b/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/tools/external/asm/org/objectweb/asm/ByteVector.java b/tools/external/asm/org/objectweb/asm/ByteVector.java
index 270778b86..a1bc32517 100644
--- a/tools/external/asm/org/objectweb/asm/ByteVector.java
+++ b/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/tools/external/asm/org/objectweb/asm/ClassAdapter.java b/tools/external/asm/org/objectweb/asm/ClassAdapter.java
index 5f12b08d5..24e34bb99 100644
--- a/tools/external/asm/org/objectweb/asm/ClassAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/ClassReader.java b/tools/external/asm/org/objectweb/asm/ClassReader.java
index 6924b57dc..9d94a42d4 100644
--- a/tools/external/asm/org/objectweb/asm/ClassReader.java
+++ b/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/tools/external/asm/org/objectweb/asm/ClassVisitor.java b/tools/external/asm/org/objectweb/asm/ClassVisitor.java
index 749c4256b..edeb58765 100644
--- a/tools/external/asm/org/objectweb/asm/ClassVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/ClassWriter.java b/tools/external/asm/org/objectweb/asm/ClassWriter.java
index 22f4e5245..81eeeb7d6 100644
--- a/tools/external/asm/org/objectweb/asm/ClassWriter.java
+++ b/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/tools/external/asm/org/objectweb/asm/Edge.java b/tools/external/asm/org/objectweb/asm/Edge.java
index c0bf108ce..5bada4e9a 100644
--- a/tools/external/asm/org/objectweb/asm/Edge.java
+++ b/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/tools/external/asm/org/objectweb/asm/FieldVisitor.java b/tools/external/asm/org/objectweb/asm/FieldVisitor.java
index 0005034ca..a05cb5a3c 100644
--- a/tools/external/asm/org/objectweb/asm/FieldVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/FieldWriter.java b/tools/external/asm/org/objectweb/asm/FieldWriter.java
index 7eb3ed4fc..0adbea91a 100644
--- a/tools/external/asm/org/objectweb/asm/FieldWriter.java
+++ b/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/tools/external/asm/org/objectweb/asm/Handler.java b/tools/external/asm/org/objectweb/asm/Handler.java
index 8bef84531..a1211ae2d 100644
--- a/tools/external/asm/org/objectweb/asm/Handler.java
+++ b/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/tools/external/asm/org/objectweb/asm/Item.java b/tools/external/asm/org/objectweb/asm/Item.java
index 4c5285f2f..fc67b0194 100644
--- a/tools/external/asm/org/objectweb/asm/Item.java
+++ b/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/tools/external/asm/org/objectweb/asm/Label.java b/tools/external/asm/org/objectweb/asm/Label.java
index 79291f27c..3998e5a86 100644
--- a/tools/external/asm/org/objectweb/asm/Label.java
+++ b/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/tools/external/asm/org/objectweb/asm/MethodAdapter.java b/tools/external/asm/org/objectweb/asm/MethodAdapter.java
index c7e127de7..a038ac713 100644
--- a/tools/external/asm/org/objectweb/asm/MethodAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/MethodVisitor.java b/tools/external/asm/org/objectweb/asm/MethodVisitor.java
index 3fccbdf14..d56b3bd1c 100644
--- a/tools/external/asm/org/objectweb/asm/MethodVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/MethodWriter.java b/tools/external/asm/org/objectweb/asm/MethodWriter.java
index e131c69ab..5b841d5fc 100644
--- a/tools/external/asm/org/objectweb/asm/MethodWriter.java
+++ b/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/tools/external/asm/org/objectweb/asm/Opcodes.java b/tools/external/asm/org/objectweb/asm/Opcodes.java
index 94359a3c2..2728d96b5 100644
--- a/tools/external/asm/org/objectweb/asm/Opcodes.java
+++ b/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/tools/external/asm/org/objectweb/asm/Type.java b/tools/external/asm/org/objectweb/asm/Type.java
index cf8dbbf99..ae314e8cd 100644
--- a/tools/external/asm/org/objectweb/asm/Type.java
+++ b/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/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java b/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java
index 4df2f7dde..f35947485 100644
--- a/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java
+++ b/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/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java b/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java
index bdd464179..d91d8e707 100644
--- a/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java
+++ b/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/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java b/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java
index c0aa9c8a8..032adf62b 100644
--- a/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java
+++ b/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/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java b/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java
index ae3b8cee7..30cadf1fc 100644
--- a/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java b/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java
index 141c8e211..13fbaa68c 100644
--- a/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java b/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java
index de7cdc4bf..d979659bd 100644
--- a/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java b/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java
index 40b4db577..aacb27cf5 100644
--- a/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/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, &quot;Example&quot;, null, &quot;java/lang/Object&quot;, null);
- * 
+ *
  * Method m = Method.getMethod(&quot;void &lt;init&gt; ()&quot;);
  * 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(&quot;void main (String[])&quot;);
  * mg = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, m, null, null, cw);
  * mg.getStatic(Type.getType(System.class), &quot;out&quot;, Type.getType(PrintStream.class));
@@ -71,10 +71,10 @@ import org.objectweb.asm.Type;
  * mg.invokeVirtual(Type.getType(PrintStream.class), Method.getMethod(&quot;void println (String)&quot;));
  * 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/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java b/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
index 1253a0b51..bfc873247 100644
--- a/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/Method.java b/tools/external/asm/org/objectweb/asm/commons/Method.java
index 741e7b5be..c5ce31407 100644
--- a/tools/external/asm/org/objectweb/asm/commons/Method.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
index 800ad4b3c..3932a01ad 100644
--- a/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+++ b/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] &gt;&gt;&gt; 24) &amp; 0xFF) |
@@ -107,7 +107,7 @@ import org.objectweb.asm.Opcodes;
  * ((sha[1] &gt;&gt;&gt; 8) &amp; 0xFF) &lt;&lt; 48 |
  * ((sha[1] &gt;&gt;&gt; 0) &amp; 0xFF) &lt;&lt; 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/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java b/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java
index 9aabe44ca..2af409e87 100644
--- a/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java
+++ b/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/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java b/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
index 73d8d926b..c90a9cabf 100644
--- a/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java b/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java
index e35fead24..5bceca157 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java b/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java
index 9cfc6de31..4a6efe5d0 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java b/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java
index 153b07ac2..b9a1a421c 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/Constant.java b/tools/external/asm/org/objectweb/asm/optimizer/Constant.java
index b07b7c2d3..c07599dea 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/Constant.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java b/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java
index c918bef0f..dff17dec6 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java b/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java
index e5e9b7682..ac5d0d317 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java b/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java
index 8302d99f7..994b4584e 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java b/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java
index dc7b1c1d6..33d82e952 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java b/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java
index 91fa98b2a..ea2927498 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java b/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java
index 9cefb1ffe..77a856b46 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java
+++ b/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/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java b/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java
index 94e4068f0..86da30779 100644
--- a/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java
+++ b/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/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java b/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java
index 363692d86..a2f31f39e 100644
--- a/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java
+++ b/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/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java b/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java
index 8f087bd2e..46df8c939 100644
--- a/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java b/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java
index b78d666a5..833d688b8 100644
--- a/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java
index 1f695e00e..e0009da98 100644
--- a/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java b/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java
index 4911e3e6e..c9c1cb98f 100644
--- a/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/ClassNode.java b/tools/external/asm/org/objectweb/asm/tree/ClassNode.java
index 0771c87dc..85134e3a5 100644
--- a/tools/external/asm/org/objectweb/asm/tree/ClassNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java
index 4399e3a25..2ae5388b1 100644
--- a/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/FieldNode.java b/tools/external/asm/org/objectweb/asm/tree/FieldNode.java
index c13ac9e22..8a97b1cbc 100644
--- a/tools/external/asm/org/objectweb/asm/tree/FieldNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java
index e7e79dc51..b5399b07d 100644
--- a/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java b/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java
index a325317b4..6af060ee8 100644
--- a/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/InsnNode.java b/tools/external/asm/org/objectweb/asm/tree/InsnNode.java
index 434dd5b31..718272600 100644
--- a/tools/external/asm/org/objectweb/asm/tree/InsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java
index 2c200a585..b9b02e382 100644
--- a/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java
index 5ab6e11ee..7dccf32be 100644
--- a/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/LabelNode.java b/tools/external/asm/org/objectweb/asm/tree/LabelNode.java
index 5eead6e33..0f8c93351 100644
--- a/tools/external/asm/org/objectweb/asm/tree/LabelNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java
index ef9551371..234b41fe3 100644
--- a/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java b/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java
index 0d4974749..2a3498844 100644
--- a/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java b/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java
index b9efe44e3..511dcf964 100644
--- a/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
index 1c8e69fcc..31eb234e8 100644
--- a/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/MemberNode.java b/tools/external/asm/org/objectweb/asm/tree/MemberNode.java
index 86b1c5c7b..11dfad862 100644
--- a/tools/external/asm/org/objectweb/asm/tree/MemberNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java
index 714aabe6e..f22744706 100644
--- a/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/MethodNode.java b/tools/external/asm/org/objectweb/asm/tree/MethodNode.java
index f746bfa3f..9d0b2e9cf 100644
--- a/tools/external/asm/org/objectweb/asm/tree/MethodNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
index a9cb3c14a..ed81347dc 100644
--- a/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
index fa5e3f820..840309dd6 100644
--- a/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java b/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
index 18cd31022..56b146574 100644
--- a/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java
index 67c6b841e..9f830b4dd 100644
--- a/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java b/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java
index 2fe3a952a..92e28ded0 100644
--- a/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java b/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java
index 9fd402831..cfd48149c 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java b/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
index 3e0afac97..c024fbade 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
index b92b57c2f..5e0c70277 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java b/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java
index 19cdb33a9..46b8cf49a 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java b/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
index 0a797d493..f65b56d8e 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java b/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java
index 07edd74f9..3847d4949 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java b/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java
index 0019d7f2c..7b7756f78 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java b/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java
index bc2d873e9..1edf40c3d 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java b/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java
index 9528482e7..cac091cb7 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java b/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java
index f7a2f5301..f989f4baf 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
index 808b3f41c..1329f77b8 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java b/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java
index 74bd590ef..3049d5a78 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java b/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java
index 44120a721..5ae010905 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java
+++ b/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/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java b/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java
index 6578b7986..4baf1b4b3 100644
--- a/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java b/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java
index 4ebc7fc09..940bc112c 100644
--- a/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java b/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java
index bb48e2cdf..0f766b32e 100644
--- a/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java b/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java
index 222325f0f..d7b73fb75 100644
--- a/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java
+++ b/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,
  *                 &quot;Hello&quot;,
  *                 null,
  *                 &quot;java/lang/Object&quot;,
  *                 null);
- * 
+ *
  *         cw.visitSource(&quot;Hello.java&quot;, null);
- * 
+ *
  *         {
  *             mv = cw.visitMethod(ACC_PUBLIC, &quot;&lt;init&gt;&quot;, &quot;()V&quot;, 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(&quot;hello&quot;);
  *     }
  * }
  * </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] &lt;fully qualified
      * class name or class file name&gt;
-     * 
+     *
      * @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/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java b/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java
index 9da152ca3..673217909 100644
--- a/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java b/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java
index 33404d975..57c55ee21 100644
--- a/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java b/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java
index 3e329f7fe..557d5c82f 100644
--- a/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java b/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
index d00933ca5..228ff04ca 100644
--- a/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java b/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java
index 640e8b083..1ca97ad6e 100644
--- a/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/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 &lt;fully qualified
      * class name or class file name&gt;
-     * 
+     *
      * @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/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java b/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java
index 1cd77c676..0123eeeb8 100644
--- a/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/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
      * '&lt;init&gt;' or '&lt;clinit&gt;'.
-     * 
+     *
      * @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/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java
index 4250c815c..8a3d4d022 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
index 827225b1c..ae812d896 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java
index 9a727e50f..bbadc911d 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java
+++ b/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] &lt;fully qualified class name or class
      * file name &gt;
-     * 
+     *
      * @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/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java
index 7546a3c92..4d20efd8b 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java
index 899f52ea7..73a511bc3 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java b/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
index c7145c0e8..e8346c633 100644
--- a/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java b/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java
index 88c7af899..e71e116fe 100644
--- a/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java b/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java
index b878357d6..e591cb935 100644
--- a/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java b/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java
index 149d7daee..f9067bfe1 100644
--- a/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java
+++ b/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/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java b/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java
index c40d2a62c..44680b57e 100644
--- a/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java b/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
index 466b93cff..826a7fe7f 100644
--- a/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/Processor.java b/tools/external/asm/org/objectweb/asm/xml/Processor.java
index 2baeb0f36..28bf2ec95 100644
--- a/tools/external/asm/org/objectweb/asm/xml/Processor.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java b/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java
index c8f6ecb99..5168fb574 100644
--- a/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java b/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
index e7382414b..6e9605c93 100644
--- a/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java b/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java
index ba362d060..55b9effe7 100644
--- a/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java b/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
index abea7fbf4..decb492ff 100644
--- a/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
+++ b/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/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java b/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
index eabf00dfc..edfba0401 100644
--- a/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
+++ b/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/tools/gnu/classpath/tools/FileSystemClassLoader.java b/tools/gnu/classpath/tools/FileSystemClassLoader.java
index 3a21fe96e..a6bd72831 100644
--- a/tools/gnu/classpath/tools/FileSystemClassLoader.java
+++ b/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/tools/gnu/classpath/tools/IOToolkit.java b/tools/gnu/classpath/tools/IOToolkit.java
index 8b6b9542c..e0ee7ba4f 100644
--- a/tools/gnu/classpath/tools/IOToolkit.java
+++ b/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/tools/gnu/classpath/tools/MalformedInputEvent.java b/tools/gnu/classpath/tools/MalformedInputEvent.java
index 9afcf0476..951766f6a 100644
--- a/tools/gnu/classpath/tools/MalformedInputEvent.java
+++ b/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/tools/gnu/classpath/tools/MalformedInputListener.java b/tools/gnu/classpath/tools/MalformedInputListener.java
index caa471ec5..53f806bf8 100644
--- a/tools/gnu/classpath/tools/MalformedInputListener.java
+++ b/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/tools/gnu/classpath/tools/NotifyingInputStreamReader.java b/tools/gnu/classpath/tools/NotifyingInputStreamReader.java
index 03121ddab..70e19b1d3 100644
--- a/tools/gnu/classpath/tools/NotifyingInputStreamReader.java
+++ b/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/tools/gnu/classpath/tools/StringToolkit.java b/tools/gnu/classpath/tools/StringToolkit.java
index d70ea931b..dbb552707 100644
--- a/tools/gnu/classpath/tools/StringToolkit.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java b/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java
index 32ab31639..6522a9ec1 100644
--- a/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/AppletTag.java b/tools/gnu/classpath/tools/appletviewer/AppletTag.java
index 80d572857..d3910a2a6 100644
--- a/tools/gnu/classpath/tools/appletviewer/AppletTag.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java b/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java
index 7e118e931..ebdd35922 100644
--- a/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java b/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
index 24b305a22..bf14db573 100644
--- a/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/Main.java b/tools/gnu/classpath/tools/appletviewer/Main.java
index 4eff8f53e..f6e02dbaa 100644
--- a/tools/gnu/classpath/tools/appletviewer/Main.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java b/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java
index d77aad392..da8399b6b 100644
--- a/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java
+++ b/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 (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);
+        if (message.startsWith("instance"))
+          {
+            // Read applet instance identifier.
+            String key = message.substring(9);
+
+            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);
         String tag = message.substring(pos + 1);
         currentWindow.setParser(tag, documentbase);
-	  }
-	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.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();
-	  }
-
-	// Read next message.
-	message = read();
+          }
+        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.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();
+          }
+
+        // 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/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java b/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
index bcf57808c..bc44a73d8 100644
--- a/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java b/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java
index cc3a65cd7..a59b03bfd 100644
--- a/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java b/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
index b92dc50f5..64d3007f3 100644
--- a/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
+++ b/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/tools/gnu/classpath/tools/appletviewer/TagParser.java b/tools/gnu/classpath/tools/appletviewer/TagParser.java
index c1e5cac52..711b26ee5 100644
--- a/tools/gnu/classpath/tools/appletviewer/TagParser.java
+++ b/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/tools/gnu/classpath/tools/common/CallbackUtil.java b/tools/gnu/classpath/tools/common/CallbackUtil.java
index 398bb6cae..838d7403a 100644
--- a/tools/gnu/classpath/tools/common/CallbackUtil.java
+++ b/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/tools/gnu/classpath/tools/common/ClasspathToolParser.java b/tools/gnu/classpath/tools/common/ClasspathToolParser.java
index b2e508729..d740646e5 100644
--- a/tools/gnu/classpath/tools/common/ClasspathToolParser.java
+++ b/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/tools/gnu/classpath/tools/common/Persistent.java b/tools/gnu/classpath/tools/common/Persistent.java
index 5a2b48a8d..5c85c9072 100644
--- a/tools/gnu/classpath/tools/common/Persistent.java
+++ b/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/tools/gnu/classpath/tools/common/ProviderUtil.java b/tools/gnu/classpath/tools/common/ProviderUtil.java
index 8d0434433..bc6d93146 100644
--- a/tools/gnu/classpath/tools/common/ProviderUtil.java
+++ b/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/tools/gnu/classpath/tools/common/SecurityProviderInfo.java b/tools/gnu/classpath/tools/common/SecurityProviderInfo.java
index e12ee4fe3..44faebf76 100644
--- a/tools/gnu/classpath/tools/common/SecurityProviderInfo.java
+++ b/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/tools/gnu/classpath/tools/doclets/AbstractDoclet.java b/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
index 8ac9add68..4369782f9 100644
--- a/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java b/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java
index 6db6cc768..0e29df928 100644
--- a/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOption.java b/tools/gnu/classpath/tools/doclets/DocletOption.java
index ccfb7fa6c..fa67f5ec7 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOption.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java b/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java
index 5bc4a6c62..e02e1ebb4 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOptionFile.java b/tools/gnu/classpath/tools/doclets/DocletOptionFile.java
index f1daf2da8..b83685755 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOptionFile.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java b/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java
index e6d206f38..13afe407f 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java b/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java
index 37a359b88..33a637db8 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java
+++ b/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/tools/gnu/classpath/tools/doclets/DocletOptionString.java b/tools/gnu/classpath/tools/doclets/DocletOptionString.java
index 2bff9ce16..ecab86541 100644
--- a/tools/gnu/classpath/tools/doclets/DocletOptionString.java
+++ b/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/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java b/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java
index 2897153b6..f7d4ac573 100644
--- a/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java
+++ b/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/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java b/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java
index eaef3e49a..8f34288a3 100644
--- a/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java
+++ b/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/tools/gnu/classpath/tools/doclets/PackageGroup.java b/tools/gnu/classpath/tools/doclets/PackageGroup.java
index bad38f885..4278ffb98 100644
--- a/tools/gnu/classpath/tools/doclets/PackageGroup.java
+++ b/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/tools/gnu/classpath/tools/doclets/PackageMatcher.java b/tools/gnu/classpath/tools/doclets/PackageMatcher.java
index 0f1b53fbe..196b74c88 100644
--- a/tools/gnu/classpath/tools/doclets/PackageMatcher.java
+++ b/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/tools/gnu/classpath/tools/doclets/StandardTaglet.java b/tools/gnu/classpath/tools/doclets/StandardTaglet.java
index 7701a6eaa..f43f2a13c 100644
--- a/tools/gnu/classpath/tools/doclets/StandardTaglet.java
+++ b/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/tools/gnu/classpath/tools/doclets/TagletPrinter.java b/tools/gnu/classpath/tools/doclets/TagletPrinter.java
index 2029d6ce9..b59704a51 100644
--- a/tools/gnu/classpath/tools/doclets/TagletPrinter.java
+++ b/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/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java b/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java
index ff93f8b09..18bf57950 100644
--- a/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java
+++ b/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/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java b/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
index 48f1c190a..ba4c8b685 100644
--- a/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
+++ b/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/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java b/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
index 4c5eb1d6e..f3b2fa8ca 100644
--- a/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
+++ b/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/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
index 0336c802c..fc5f045ef 100644
--- a/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+++ b/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()) {
 
@@ -3757,7 +3757,7 @@ public class HtmlDoclet
             Properties versionProperties = new Properties();
             InputStream in = getClass().getResourceAsStream("/version.properties");
             if (in == null) {
-            	in = new FileInputStream("src/resources/version.properties");
+                in = new FileInputStream("src/resources/version.properties");
             }
             versionProperties.load(in);
             docletVersion = versionProperties.getProperty("gjdoc.version");
@@ -3775,8 +3775,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 {
@@ -3796,7 +3796,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;
       }
@@ -3811,25 +3811,25 @@ public class HtmlDoclet
     TypeVariable[] params = classDoc.typeParameters();
     if (params != null && params.length > 0)
       {
-	parameters = "&lt;";
-	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 += "&gt;";
+        parameters = "&lt;";
+        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 += "&gt;";
       }
     return parameters;
   }
diff --git a/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java b/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java
index e833627fd..0315cb5df 100644
--- a/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java
+++ b/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/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java b/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java
index 5cd272d10..7b8961361 100644
--- a/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java b/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java
index b08d49026..29a9e0906 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java
+++ b/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)) {
-
-		  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)) {
-
-		  workingPath = option[1];
-	       }
-	       else if ("-tagletpath".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)) {
+
+                  title = option[1];
+               }
+               else if ("-workpath".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
-
-	    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
-
-	    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
-
-	    println();
-	    println(1, "<!-- Package groups specified by user 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;
+
+            // 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;
+
+            // Output package group information specified on the
+            // 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
-
-	    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
-
-	    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();
-	    printCloseTag(0, "rootdoc");
-
-	    closeTargetFile();
+            // 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;
+
+            // 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();
+            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, 
-		  "<", "&lt;"
-		  ), 
-	       ">", "&gt;"
-	       ),
-	    "&", "&amp;"
-	    );
+      return
+         replaceString(
+            replaceString(
+               replaceString(
+                  tagContent,
+                  "<", "&lt;"
+                  ),
+               ">", "&gt;"
+               ),
+            "&", "&amp;"
+            );
    }
 
    /**
@@ -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/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java b/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java
index e2297d8e9..6744947af 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java b/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java
index 175d4e864..582a45b32 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java
+++ b/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("&lt;"+tag+"&gt;");
-	 return;
+         if (!noEmailWarn) {
+            printWarning("Tag looks like email address: <"+tagName+">");
+         }
+         output.append("&lt;"+tag+"&gt;");
+         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;
-
-	 int state = STATE_INITIAL;
-	       
-	 String newAttributes = "";
-	 String attributeName = null;
-	 StringBuffer buf = new StringBuffer();
-
-	 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;
-
-	    switch (state) {
-
-	    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_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_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_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_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_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) {
-
-	    // 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);
-	    }
-
-	    // 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+"/>");
-	 }
+         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();
+
+         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;
+
+            switch (state) {
+
+            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_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_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_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_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_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) {
+
+            // 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);
+            }
+
+            // 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;
-
-	 if (i<textAsChars.length) {
-	    c = textAsChars[i];
-	 }
-	 else {
-	    c = -1;
-	 }
-
-	 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("&gt;");
-	    }
-	    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("&amp;");
-	       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("&amp;");
-	       buf.append("&gt;");
-	       state = STATE_INITIAL;
-	    }
-	    else if ('&'==c) {
-	       buf.append("&amp;");
-	       buf.append("&amp;");
-	       state = STATE_INITIAL;
-	    }
-	    else if (-1==c) {
-	       buf.append("&amp;");
-	       haveText(buf.toString());
-	       buf.setLength(0);
-	       state = STATE_INITIAL;
-	       continue;
-	    }
+         int c;
+
+         if (i<textAsChars.length) {
+            c = textAsChars[i];
+         }
+         else {
+            c = -1;
+         }
+
+         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("&gt;");
+            }
+            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("&amp;");
+               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("&amp;");
+               buf.append("&gt;");
+               state = STATE_INITIAL;
+            }
+            else if ('&'==c) {
+               buf.append("&amp;");
+               buf.append("&amp;");
+               state = STATE_INITIAL;
+            }
+            else if (-1==c) {
+               buf.append("&amp;");
+               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("&amp;");
                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("&amp;");
-	       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("&amp;");
+               buf.append((char)c);
+               state = STATE_INITIAL;
+            }
             */
-	    break;
-	    
-	 case STATE_TAG_START:
-	    if (" \t\r\n".indexOf(c)>=0) {
-	       //continue;
-
-	       // new: assume this is a less-sign
-	       haveText("&lt;"+c);
-	       state = STATE_INITIAL;
-	    }
-	    else if ('/'==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG;
-	    }
-	    else if ('<'==c) {
-	       // assume this is a less-sign
-	       haveText("&lt;&lt;");
-	       state = STATE_INITIAL;	       
-	    }
-	    else if ('>'==c) {
-	       // assume this is a less-sign
-	       haveText("&lt;&gt;");
-	       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("&lt;"+(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_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;
-	 }
+            break;
+
+         case STATE_TAG_START:
+            if (" \t\r\n".indexOf(c)>=0) {
+               //continue;
+
+               // new: assume this is a less-sign
+               haveText("&lt;"+c);
+               state = STATE_INITIAL;
+            }
+            else if ('/'==c) {
+               buf.append((char)c);
+               state = STATE_TAG;
+            }
+            else if ('<'==c) {
+               // assume this is a less-sign
+               haveText("&lt;&lt;");
+               state = STATE_INITIAL;
+            }
+            else if ('>'==c) {
+               // assume this is a less-sign
+               haveText("&lt;&gt;");
+               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("&lt;"+(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_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/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java b/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
index 6fdb8cb48..6e05a5e96 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java
index 3a8cabceb..c5a9f82b9 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
index 1992d1662..092d0cea7 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java
index bfb3f7697..96ffefa0f 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java
index 8bf658358..5c99ec3bd 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java
index f6eb679f8..b7b100be1 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java
+++ b/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/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java b/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java
index b4e394cec..b0ede615d 100644
--- a/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java
+++ b/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/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java b/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java
index 455389127..53a4f3d1d 100644
--- a/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java
+++ b/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/tools/gnu/classpath/tools/getopt/Option.java b/tools/gnu/classpath/tools/getopt/Option.java
index 53255811e..e7b5d82e7 100644
--- a/tools/gnu/classpath/tools/getopt/Option.java
+++ b/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/tools/gnu/classpath/tools/getopt/OptionGroup.java b/tools/gnu/classpath/tools/getopt/OptionGroup.java
index 63853b2d0..83fcca0f8 100644
--- a/tools/gnu/classpath/tools/getopt/OptionGroup.java
+++ b/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/tools/gnu/classpath/tools/getopt/Parser.java b/tools/gnu/classpath/tools/getopt/Parser.java
index bb38e82ac..f23250eca 100644
--- a/tools/gnu/classpath/tools/getopt/Parser.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java b/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
index 2ec5af477..adb5b65d5 100644
--- a/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java b/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java
index 4bfac862f..cde5cbe90 100644
--- a/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java b/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
index b10122471..b38c2b083 100644
--- a/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
+++ b/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;
-	    }
-
-	    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);
+            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);
                      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="";
-	    }
-
-	    if (c=='{' && state==STATE_NORMAL) break;
-	 }
-	 prev=c;
+               }
+               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 (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;
-
-	 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());
-	 }
-	 */
-
-	 if (superclass instanceof ClassDocProxy) {
-
-	    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;
-	    }
-	 }
+         resolved=true;
+
+         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());
+         }
+         */
+
+         if (superclass instanceof ClassDocProxy) {
+
+            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 (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;
-
-	 ClassDoc _superclass = cdi.superclass();
-	 if (null == _superclass) {
-	    break;
-	 }
-	 else {
-	    cdi = _superclass;
-	 }
+         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;
+         }
       }
-      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/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java b/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
index 6dfe821bc..253cf5ec4 100644
--- a/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java b/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
index b3fd83c73..9a81cb793 100644
--- a/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java b/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java
index 06785ae0f..ad31ba69e 100644
--- a/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/Debug.java b/tools/gnu/classpath/tools/gjdoc/Debug.java
index 3dddf43d2..d5020236c 100644
--- a/tools/gnu/classpath/tools/gjdoc/Debug.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java b/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java
index da365d983..706e9b6cc 100644
--- a/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/DocImpl.java b/tools/gnu/classpath/tools/gjdoc/DocImpl.java
index 86680799e..ecd810040 100644
--- a/tools/gnu/classpath/tools/gjdoc/DocImpl.java
+++ b/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();
-	 }
-
-	 // Always include period at end of sentence if there is one.
-	 if (firstSentenceEnd < comment.length
-			 && '.' == comment[firstSentenceEnd]) {
-	    ++ firstSentenceEnd;
-	 }
+         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();
+         }
+
+         // 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);
-	    }
-
-	    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);
+               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;
+
+         case STATE_WHITESPACE:
+            if (i==firstSentenceEnd) {
+               AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
                if (null != newTag) {
                   contextTag = newTag;
                }
-	       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);
+               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 (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;
-
-	 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);
+                  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);
                if (null != newTag) {
                   contextTag = newTag;
                }
-	       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_INLINEPARAM:
-	    if (c=='}') {
+               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_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);
+            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);
+            }
+            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);
+               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);
+               }
+            }
+            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);
+                  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);
-	    }
+               setBufLength(0);
+            }
 
-	    if (c==EOL) {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, "text", paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+            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);
+            }
+            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;
+               ++i;
                setBufLength(0);
-	       state=STATE_INLINEPARAM;
-	    }
-	    else {
-	       appendToBuf(c);
-	    }
-	    break;
-
-	 default:
-	    throw new Error("illegal state "+state);
-	 }
+               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);
-
-	 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));
+         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()];
+         }
+
+         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/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java b/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java
index 129689bc9..3c139ab25 100644
--- a/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java b/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
index f177c1531..d5b1b1eb0 100644
--- a/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
+++ b/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());
-
-	 if (signatureBuf.length()>0) {
-	    signatureBuf.append(",");
-	    flatSignatureBuf.append(",");
-	 }
-	 signatureBuf.append(parameters[i].type().qualifiedTypeName());
-	 flatSignatureBuf.append(parameters[i].type().typeName());
+         ((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());
          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/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java b/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
index 341797611..f99024daa 100644
--- a/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
+++ b/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:
+            break;
+
+         case STATE_QUOTE:
             fieldValueLiteralBuf.append(c);
-	    if ('\\' == c) {
-	       state = STATE_QUOTEBS;
-	    }
-	    else if ('\"' == c) {
-	       state = prevState;
-	    }
-	    break;
-	    
-	 case STATE_SQUOTE:
+            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:
+            if ('\\' == c) {
+               state = STATE_SQUOTEBS;
+            }
+            else if ('\'' == c) {
+               state = prevState;
+            }
+            break;
+
+         case STATE_QUOTEBS:
             fieldValueLiteralBuf.append(c);
-	    state = STATE_QUOTE;
-	    break;
+            state = STATE_QUOTE;
+            break;
 
-	 case STATE_SQUOTEBS:
+         case STATE_SQUOTEBS:
             fieldValueLiteralBuf.append(c);
-	    state = STATE_SQUOTE;
-	    break;
+            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/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java b/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java
index e0c74cea1..4cfbbe451 100644
--- a/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java b/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java
index a49be2f9e..d45786fb9 100644
--- a/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java b/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java
index 95b706acd..3be63dd79 100644
--- a/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java b/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java
index f5a507bdb..93c08b94d 100644
--- a/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java b/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java
index ac92dba86..3b2b8a848 100644
--- a/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/Main.java b/tools/gnu/classpath/tools/gjdoc/Main.java
index a6d335a37..d0fd296e6 100644
--- a/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java b/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
index 07817bcb9..acc812863 100644
--- a/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
+++ b/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.
-	     *
-
-	    Main.getRootDoc().printError("Class not found '"
-			                 + className
-					 + "' in class '"
-					 + containingClass().qualifiedName()
-					 + "' member '"
-					 + name()
-					 + "'");
-	    */
-	 }
+         }
+         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()
+                                         + "'");
+            */
+         }
       }
    }
 
diff --git a/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java b/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java
index 34f3b2854..78748c848 100644
--- a/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java b/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
index 2f37e445c..84960bcf3 100644
--- a/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
+++ b/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);
-	 }
-
-	 if (classDoc.isInterface()) {
-	    interfacesList.add(classDoc);
-	 }
-	 else if (classDoc.isException()) {
-	    exceptionsList.add(classDoc);
-	 }
-	 else if (classDoc.isError()) {
-	    errorsList.add(classDoc);
-	 }
-	 else {
-	    ordinaryClassesList.add(classDoc);
-	 }
+         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);
+         }
       }
    }
 
    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/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java b/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java
index 499d43e31..a7491dc8e 100644
--- a/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java b/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java
index 133077d06..29b8e9b70 100644
--- a/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ParseException.java b/tools/gnu/classpath/tools/gjdoc/ParseException.java
index c0ea48ea7..3ecd84592 100644
--- a/tools/gnu/classpath/tools/gjdoc/ParseException.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/Parser.java b/tools/gnu/classpath/tools/gjdoc/Parser.java
index 030d4ae31..d355b5384 100644
--- a/tools/gnu/classpath/tools/gjdoc/Parser.java
+++ b/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) {
-
-	       for (index+=7; index<source.length && source[index]!=';'; ++index)
-		  ;
-
-	       return index+1;
-	    }
-	 }
-	 return -1;
+         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)
+                  ;
+
+               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) {
-
-	       for (index+=7; index<source.length && source[index]!=';'; ++index)
-		  ;
-
-	       return index+1;
-	    }
-	 }
-	 return -1;
+         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)
+                  ;
+
+               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;
-
-	 int state=STATE_NORMAL;
+         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 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;
-	 }
-
-	 //System.err.println("char is "+source[index]);
-
-	 if (source[index]!=';') {
-	    index=Parser.skipExpression(source, index, 0, ';');
-	 }
-	 return index+1;
+            case ';':  // field
+               isField=true;
+               break;
+            }
+            if (isField) break;
+         }
+         if (!isField || index==source.length) {
+            return -1;
+         }
+
+         //System.err.println("char is "+source[index]);
+
+         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);
-	    }
-	 }
-
-	 parser.setLastComment(null);
-	 return endIndex;
+            if (field.isIncluded()) {
+               parser.ctx.filteredFieldList.add(field);
+            }
+            if (fieldHasSerialTag) {
+               parser.ctx.sfieldList.add(field);
+            }
+         }
+
+         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;
-
-	 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;
+         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;
       }
-   
+
 
    }
 
    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 (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)
-		  ;
-
-	       if (index<source.length && source[index]=='{')
-		  return index+1;
-	       else
-		  return -1;
-	    }
-	 }
-	 return -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') {
+
+               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;
       }
 
    }
@@ -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;
-
-	 return index+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;
       }
 
       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(),
-	 };
-
-	 classLevelComponents=new SourceComponent[] {
-	    new Whitespace(),
-	    new BracketClose(),
-	    new CommentComponent(),
-	    new SlashSlashCommentComponent(),
-	    new FunctionComponent(),
-	    new StaticBlockComponent(),
-	    new ImportComponent(),
-	    new ClassComponent(),
-	    new FieldComponent(),
-	 };
+         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(),
+         };
       }
       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;
-	    }
-	 }
-
-	 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)));
-	 }
+         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)));
+         }
 
       }
       //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/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java b/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java
index a5588ff46..bdcf61bf6 100644
--- a/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java b/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
index 21640d2fe..09d1be73b 100644
--- a/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
+++ b/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);
-
-	    ClassDoc[] packageClassDocs=specifiedPackageDoc.allClasses();
-	    for (int i=0; i<packageClassDocs.length; ++i) {
-	       ClassDocImpl specifiedPackageClassDoc=(ClassDocImpl)packageClassDocs[i];
-            
-	       specifiedPackageClassDoc.setIsIncluded(true);
-	       classesList.add(specifiedPackageClassDoc);
-	    }
-	 }
+         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);
+            }
+         }
       }
 
       //--- 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;
-
-	    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();
-	    }
-
-	    // Now that outer/super references have been resolved, try again
-	    // to find the class.
-
-	    loadedClass = (ClassDoc)scheduledClassContext.findClass(scheduledClassName);
-
-	    int numberOfProcessedFilesAfter = parser.getNumberOfProcessedFiles();
-
-	    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);
-
-	    /* 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()
-	       + "'");
-	    */
-	 }
+            // 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();
+
+            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.
+
+            loadedClass = (ClassDoc)scheduledClassContext.findClass(scheduledClassName);
+
+            int numberOfProcessedFilesAfter = parser.getNumberOfProcessedFiles();
+
+            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);
+
+            /* 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()
+               + "'");
+            */
+         }
       }
    }
 
@@ -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/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java b/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java
index 971cdef52..12e2256dc 100644
--- a/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java b/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
index a4408fc76..0ecfe637c 100644
--- a/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java b/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java
index 93f487912..e2d73bbd5 100644
--- a/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TagContainer.java b/tools/gnu/classpath/tools/gjdoc/TagContainer.java
index d3e243ede..1b9bc40d9 100644
--- a/tools/gnu/classpath/tools/gjdoc/TagContainer.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TagImpl.java b/tools/gnu/classpath/tools/gjdoc/TagImpl.java
index d51ce239a..a4b1f4b2a 100644
--- a/tools/gnu/classpath/tools/gjdoc/TagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java b/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java
index f062b2a8d..0333ee2b7 100644
--- a/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java b/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java
index f8f19630a..812fd2fde 100644
--- a/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java b/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java
index b48236af0..e4e7bbfcb 100644
--- a/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/Timer.java b/tools/gnu/classpath/tools/gjdoc/Timer.java
index bd866b3c1..93404d08e 100644
--- a/tools/gnu/classpath/tools/gjdoc/Timer.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java b/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java
index 7d364a172..c2c3c3edf 100644
--- a/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TypeImpl.java b/tools/gnu/classpath/tools/gjdoc/TypeImpl.java
index a0b4cf0d2..8c1bd5a0d 100644
--- a/tools/gnu/classpath/tools/gjdoc/TypeImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java b/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java
index 097b1ff86..08a236683 100644
--- a/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java b/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java
index 14381dff5..024594c6a 100644
--- a/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/WritableType.java b/tools/gnu/classpath/tools/gjdoc/WritableType.java
index 00f599bb2..39cfb3f25 100644
--- a/tools/gnu/classpath/tools/gjdoc/WritableType.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java
index ed2cb24ba..82502c431 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java
index 6411cdac7..ac807728b 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java
index 90ae89203..3c44ce7d8 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java
index 519ab8287..15d016e1f 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java
index 7b3312e91..1b37c233a 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java
index 28ba32f01..557b514c7 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java
index 7314fa9bc..7fa51869c 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java
index c7fbee838..f6ef45cf5 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java
index 17129e255..32ccea209 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java
index 27ed3b308..eca1a5257 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java b/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java
index 008cee64a..a9bfacc89 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java
index c01dc6a40..d9532efb0 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java
index 4119dd9d1..83faf1f20 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java
index ccdeed995..e206e567f 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java
index a6dfef169..3cbeac126 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java
index 1b8e35a7f..5faa5a17b 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java
index 78f8590c1..93923e6ae 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java
index 0735ff641..46895500d 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java
index 667eb615a..10804a695 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java
index c6828f4ec..a0a2f4b80 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java
index e5b1e2532..c27b10b8a 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java
index ef9f76e87..5f4f00e1c 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java b/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java
index ba24cc392..4e9ecdee1 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/Context.java b/tools/gnu/classpath/tools/gjdoc/expr/Context.java
index f22dffb36..f6d1ebc10 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/Context.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java
index caa9ae907..85206d4fb 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java
index 18639adda..d7385fd7c 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java b/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
index e1d089f23..d12da3519 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java b/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
index 0f51f90db..cf4df8938 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java
index 1d4b0fbb7..eb992fc28 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/Expression.java b/tools/gnu/classpath/tools/gjdoc/expr/Expression.java
index 6a0f3dc20..ca1ccc645 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/Expression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java
index 6594b4967..995f7ae80 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java
index 51f3cd22d..4e7ca4a01 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java
index 2d8df5ea7..8d254927c 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java b/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java
index 315265e93..65cd5da11 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java
index 7a3d69e5b..2b0250133 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java
index dbddecb41..4e784cdcc 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java
index 9ba697c0b..803ad5ee3 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java
index b78315ed2..3b0409155 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java
index dc85eb65c..4c7bf70f7 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java
index 181bb68e2..625a6e5e8 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java
index 6375b163d..6aca379dc 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java
index 6108a97bf..3d3071a50 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java
index 6cdb0c9cc..5b66fecd2 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java
index c7db2550d..eb49bc087 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java
index 41bb0fc2b..7359a055a 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java
index 132cd35f4..ad72efbfb 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java
index bebd0ce51..f9d7820bb 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java
index 8f9def918..dc0101ffc 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/Type.java b/tools/gnu/classpath/tools/gjdoc/expr/Type.java
index 55c8b9965..92382c41a 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/Type.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java
index 46f0cc534..c434ae870 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java b/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java
index 9a912b955..33befcb84 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java
+++ b/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/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java b/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java
index 9eedd6617..894a71716 100644
--- a/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java
+++ b/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/tools/gnu/classpath/tools/jar/Creator.java b/tools/gnu/classpath/tools/jar/Creator.java
index 6ffce18ac..be8d2a16f 100644
--- a/tools/gnu/classpath/tools/jar/Creator.java
+++ b/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/tools/gnu/classpath/tools/jar/Indexer.java b/tools/gnu/classpath/tools/jar/Indexer.java
index 217b64405..ae79b26e9 100644
--- a/tools/gnu/classpath/tools/jar/Indexer.java
+++ b/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/tools/gnu/classpath/tools/jar/Main.java b/tools/gnu/classpath/tools/jar/Main.java
index e5f1a3fb1..34ef928fe 100644
--- a/tools/gnu/classpath/tools/jar/Main.java
+++ b/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/tools/gnu/classpath/tools/jar/Updater.java b/tools/gnu/classpath/tools/jar/Updater.java
index f25d56fdc..e1df852ff 100644
--- a/tools/gnu/classpath/tools/jar/Updater.java
+++ b/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/tools/gnu/classpath/tools/jarsigner/JarVerifier.java b/tools/gnu/classpath/tools/jarsigner/JarVerifier.java
index 8847441fa..b920d74c1 100644
--- a/tools/gnu/classpath/tools/jarsigner/JarVerifier.java
+++ b/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/tools/gnu/classpath/tools/jarsigner/Main.java b/tools/gnu/classpath/tools/jarsigner/Main.java
index cea521c7e..c7fb5856a 100644
--- a/tools/gnu/classpath/tools/jarsigner/Main.java
+++ b/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/tools/gnu/classpath/tools/jarsigner/SFHelper.java b/tools/gnu/classpath/tools/jarsigner/SFHelper.java
index dc0f19937..9e4882f0e 100644
--- a/tools/gnu/classpath/tools/jarsigner/SFHelper.java
+++ b/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/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java b/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java
index 70e238ec7..90c6d4c38 100644
--- a/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java
+++ b/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()-("&quot;").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/tools/gnu/classpath/tools/javah/ClassWrapper.java b/tools/gnu/classpath/tools/javah/ClassWrapper.java
index 4b4d25046..ffecac35c 100644
--- a/tools/gnu/classpath/tools/javah/ClassWrapper.java
+++ b/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/tools/gnu/classpath/tools/javah/CniPrintStream.java b/tools/gnu/classpath/tools/javah/CniPrintStream.java
index 52e6e539d..df2b723e7 100644
--- a/tools/gnu/classpath/tools/javah/CniPrintStream.java
+++ b/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/tools/gnu/classpath/tools/javah/GcjhMain.java b/tools/gnu/classpath/tools/javah/GcjhMain.java
index 0b69d3116..bf466484d 100644
--- a/tools/gnu/classpath/tools/javah/GcjhMain.java
+++ b/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/tools/gnu/classpath/tools/javah/JniHelper.java b/tools/gnu/classpath/tools/javah/JniHelper.java
index f2ca90e01..9225444be 100644
--- a/tools/gnu/classpath/tools/javah/JniHelper.java
+++ b/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/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index bbede8ea0..cb8bcd8d9 100644
--- a/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/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/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/tools/gnu/classpath/tools/javah/JniStubPrinter.java
index 41b90b017..4a1803a27 100644
--- a/tools/gnu/classpath/tools/javah/JniStubPrinter.java
+++ b/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/tools/gnu/classpath/tools/javah/Keywords.java b/tools/gnu/classpath/tools/javah/Keywords.java
index 73e2c627c..9c76a3660 100644
--- a/tools/gnu/classpath/tools/javah/Keywords.java
+++ b/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/tools/gnu/classpath/tools/javah/Main.java b/tools/gnu/classpath/tools/javah/Main.java
index 15fd52c8a..bec04f00d 100644
--- a/tools/gnu/classpath/tools/javah/Main.java
+++ b/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/tools/gnu/classpath/tools/javah/MethodHelper.java b/tools/gnu/classpath/tools/javah/MethodHelper.java
index 8743f9a84..d65cc93d7 100644
--- a/tools/gnu/classpath/tools/javah/MethodHelper.java
+++ b/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/tools/gnu/classpath/tools/keytool/CACertCmd.java b/tools/gnu/classpath/tools/keytool/CACertCmd.java
index a53a8b21a..603385d19 100644
--- a/tools/gnu/classpath/tools/keytool/CACertCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/CertReqCmd.java b/tools/gnu/classpath/tools/keytool/CertReqCmd.java
index 327320ad1..e14fa4916 100644
--- a/tools/gnu/classpath/tools/keytool/CertReqCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/Command.java b/tools/gnu/classpath/tools/keytool/Command.java
index af91e4a71..050e75b37 100644
--- a/tools/gnu/classpath/tools/keytool/Command.java
+++ b/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/tools/gnu/classpath/tools/keytool/DeleteCmd.java b/tools/gnu/classpath/tools/keytool/DeleteCmd.java
index 53611b21c..5a9cbfd1f 100644
--- a/tools/gnu/classpath/tools/keytool/DeleteCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/ExportCmd.java b/tools/gnu/classpath/tools/keytool/ExportCmd.java
index e0f165425..035fbab6a 100644
--- a/tools/gnu/classpath/tools/keytool/ExportCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/GenKeyCmd.java b/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
index 79d3824af..b892ca794 100644
--- a/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java b/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
index ac0ee1329..e52c90299 100644
--- a/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/ImportCmd.java b/tools/gnu/classpath/tools/keytool/ImportCmd.java
index 18a21aa68..b68760d09 100644
--- a/tools/gnu/classpath/tools/keytool/ImportCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java b/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
index 973ed46ce..a05a5962f 100644
--- a/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java b/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
index 5f91becd9..7652cc843 100644
--- a/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/ListCmd.java b/tools/gnu/classpath/tools/keytool/ListCmd.java
index 9c9f871cd..55c8c7683 100644
--- a/tools/gnu/classpath/tools/keytool/ListCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/PrintCertCmd.java b/tools/gnu/classpath/tools/keytool/PrintCertCmd.java
index 2100a6026..cb9d03513 100644
--- a/tools/gnu/classpath/tools/keytool/PrintCertCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/SelfCertCmd.java b/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
index f297046c7..395bfe2cd 100644
--- a/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
+++ b/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/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java b/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
index 489ecccb0..24a4b0fa1 100644
--- a/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
+++ b/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/tools/gnu/classpath/tools/orbd/Main.java b/tools/gnu/classpath/tools/orbd/Main.java
index 15f3612cc..52aa5bd89 100644
--- a/tools/gnu/classpath/tools/orbd/Main.java
+++ b/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/tools/gnu/classpath/tools/orbd/PersistentContext.java b/tools/gnu/classpath/tools/orbd/PersistentContext.java
index 9b4f27a3d..4526813b8 100644
--- a/tools/gnu/classpath/tools/orbd/PersistentContext.java
+++ b/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/tools/gnu/classpath/tools/orbd/PersistentContextMap.java b/tools/gnu/classpath/tools/orbd/PersistentContextMap.java
index e983ef30f..d83f2bf4c 100644
--- a/tools/gnu/classpath/tools/orbd/PersistentContextMap.java
+++ b/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/tools/gnu/classpath/tools/orbd/PersistentMap.java b/tools/gnu/classpath/tools/orbd/PersistentMap.java
index 87ade64cc..a39ff28ba 100644
--- a/tools/gnu/classpath/tools/orbd/PersistentMap.java
+++ b/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/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java b/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java
index 492566a80..7c6b7222f 100644
--- a/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java
+++ b/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/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
index 251e2199e..9ac103c75 100644
--- a/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
+++ b/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/tools/gnu/classpath/tools/rmic/CompilationError.java b/tools/gnu/classpath/tools/rmic/CompilationError.java
index 244b46913..2bfea7cc4 100644
--- a/tools/gnu/classpath/tools/rmic/CompilationError.java
+++ b/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/tools/gnu/classpath/tools/rmic/Generator.java b/tools/gnu/classpath/tools/rmic/Generator.java
index 270f6eaf8..ba659d2c5 100644
--- a/tools/gnu/classpath/tools/rmic/Generator.java
+++ b/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/tools/gnu/classpath/tools/rmic/GiopIo.java b/tools/gnu/classpath/tools/rmic/GiopIo.java
index 42f291b4f..c3b3bc0a4 100644
--- a/tools/gnu/classpath/tools/rmic/GiopIo.java
+++ b/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/tools/gnu/classpath/tools/rmic/HashFinder.java b/tools/gnu/classpath/tools/rmic/HashFinder.java
index c3e363c8d..7b6fc9bb5 100644
--- a/tools/gnu/classpath/tools/rmic/HashFinder.java
+++ b/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/tools/gnu/classpath/tools/rmic/Main.java b/tools/gnu/classpath/tools/rmic/Main.java
index 204bb3be7..868fc758e 100644
--- a/tools/gnu/classpath/tools/rmic/Main.java
+++ b/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/tools/gnu/classpath/tools/rmic/MethodGenerator.java b/tools/gnu/classpath/tools/rmic/MethodGenerator.java
index ecac90765..27a4bd2e1 100644
--- a/tools/gnu/classpath/tools/rmic/MethodGenerator.java
+++ b/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/tools/gnu/classpath/tools/rmic/RMICException.java b/tools/gnu/classpath/tools/rmic/RMICException.java
index 28eb8d42c..ca9983d0a 100644
--- a/tools/gnu/classpath/tools/rmic/RMICException.java
+++ b/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/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java b/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
index 8d1a1e805..e02f086ef 100644
--- a/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
+++ b/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/tools/gnu/classpath/tools/rmic/RmicBackend.java b/tools/gnu/classpath/tools/rmic/RmicBackend.java
index db71b21ef..92f982d53 100644
--- a/tools/gnu/classpath/tools/rmic/RmicBackend.java
+++ b/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/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java b/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
index b7ad7f440..dd35c2bd5 100644
--- a/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
+++ b/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/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java b/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
index a6f642b79..413d91ad2 100644
--- a/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
+++ b/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/tools/gnu/classpath/tools/rmic/Variables.java b/tools/gnu/classpath/tools/rmic/Variables.java
index e3568e933..1fc6a8095 100644
--- a/tools/gnu/classpath/tools/rmic/Variables.java
+++ b/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/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java b/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
index 3737334a4..cb412851b 100644
--- a/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
+++ b/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/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java b/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
index 402727ff3..fb2764873 100644
--- a/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
+++ b/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/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java b/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java
index 535f8ab92..446a87fb2 100644
--- a/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java
+++ b/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/tools/gnu/classpath/tools/rmid/Main.java b/tools/gnu/classpath/tools/rmid/Main.java
index 4ee079c1e..3cc2a12ad 100644
--- a/tools/gnu/classpath/tools/rmid/Main.java
+++ b/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/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java b/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java
index d213373d5..9d9849663 100644
--- a/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java
+++ b/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/tools/gnu/classpath/tools/rmiregistry/Main.java b/tools/gnu/classpath/tools/rmiregistry/Main.java
index e5c41930d..f22e81b6e 100644
--- a/tools/gnu/classpath/tools/rmiregistry/Main.java
+++ b/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/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java b/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java
index 89d66ce4a..3202a8405 100644
--- a/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java
+++ b/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/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java b/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java
index b93d3c116..80d0fe0c1 100644
--- a/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java
+++ b/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/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java b/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java
index 5150debd1..fa717892a 100644
--- a/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java
+++ b/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/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java b/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java
index 94d35e92f..dfb277fbd 100644
--- a/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java
+++ b/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/tools/gnu/classpath/tools/serialver/SerialVer.java b/tools/gnu/classpath/tools/serialver/SerialVer.java
index ba586170e..5fd7419b2 100644
--- a/tools/gnu/classpath/tools/serialver/SerialVer.java
+++ b/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/tools/gnu/classpath/tools/taglets/AuthorTaglet.java b/tools/gnu/classpath/tools/taglets/AuthorTaglet.java
index fd6e924f1..1a1f32b7d 100644
--- a/tools/gnu/classpath/tools/taglets/AuthorTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/CodeTaglet.java b/tools/gnu/classpath/tools/taglets/CodeTaglet.java
index f76e77965..adc34f391 100644
--- a/tools/gnu/classpath/tools/taglets/CodeTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java b/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java
index 6f744a9f2..60e3e40a8 100644
--- a/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java b/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java
index aae4ad357..d292c7f3a 100644
--- a/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/GenericTaglet.java b/tools/gnu/classpath/tools/taglets/GenericTaglet.java
index 34eac2bad..31ff28922 100644
--- a/tools/gnu/classpath/tools/taglets/GenericTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java b/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java
index 5f8726aa0..e78019067 100644
--- a/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/SinceTaglet.java b/tools/gnu/classpath/tools/taglets/SinceTaglet.java
index aa1e11491..c3737522d 100644
--- a/tools/gnu/classpath/tools/taglets/SinceTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/TagletContext.java b/tools/gnu/classpath/tools/taglets/TagletContext.java
index ff26747e2..82d8aea26 100644
--- a/tools/gnu/classpath/tools/taglets/TagletContext.java
+++ b/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/tools/gnu/classpath/tools/taglets/ValueTaglet.java b/tools/gnu/classpath/tools/taglets/ValueTaglet.java
index cfc393886..1b07ada8c 100644
--- a/tools/gnu/classpath/tools/taglets/ValueTaglet.java
+++ b/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/tools/gnu/classpath/tools/taglets/VersionTaglet.java b/tools/gnu/classpath/tools/taglets/VersionTaglet.java
index fadb972ea..fed926e06 100644
--- a/tools/gnu/classpath/tools/taglets/VersionTaglet.java
+++ b/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/tools/gnu/classpath/tools/tnameserv/Main.java b/tools/gnu/classpath/tools/tnameserv/Main.java
index 78a8f98c4..b163fd539 100644
--- a/tools/gnu/classpath/tools/tnameserv/Main.java
+++ b/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
 {
author	Andrew John Hughes <gnu_andrew@member.fsf.org>	2010-06-03 19:11:10 +0000
committer	Andrew John Hughes <gnu_andrew@member.fsf.org>	2010-06-03 19:11:10 +0000
commit	a17284098845d59d84bbf76b33190a5a91c12a82 (patch)
tree	c634c40062604cd1cdefa535b838926c9ede1a38 /tools
parent	43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download	classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz