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 /javax/print
parent: 43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download: classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz
121 files changed, 1936 insertions, 1940 deletions
diff --git a/javax/print/AttributeException.java b/javax/print/AttributeException.java
index 1251b00bb..9a72c53d0 100644
--- a/javax/print/AttributeException.java
+++ b/javax/print/AttributeException.java
@@ -46,29 +46,29 @@ import javax.print.attribute.Attribute;
  * provide further information of printing errors if unsupported
  * attribute classes or values of attributes are involved.
  * <p>
- * There exists no <code>PrintException</code> class implementing this 
- * interface. Providing these extensions in <code>PrintException</code> 
- * subclasses is left to the concrete print service implementation. 
- * </p> 
- * 
+ * There exists no <code>PrintException</code> class implementing this
+ * interface. Providing these extensions in <code>PrintException</code>
+ * subclasses is left to the concrete print service implementation.
+ * </p>
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface AttributeException
 {
   /**
    * Returns the unsupported printing attribute classes for a print service
-   * that does not support the attribute category at all. The returned 
+   * that does not support the attribute category at all. The returned
    * class instances are sublcasses of the base interface {@link Attribute}.
-   * 
+   *
    * @return The unsupported attribute classes, or <code>null</code> if there
    * are no such attribute classes.
    */
   Class[] getUnsupportedAttributes();
-  
+
   /**
    * Returns the unsupported attribute values of printing attributes a specific
    * print service does support but not the particular provided value.
-   *   
+   *
    * @return The unsupported attribute values, or <code>null</code> if there
    * are no such attributes values.
    */
diff --git a/javax/print/CancelablePrintJob.java b/javax/print/CancelablePrintJob.java
index 39a25440e..60ad584aa 100644
--- a/javax/print/CancelablePrintJob.java
+++ b/javax/print/CancelablePrintJob.java
@@ -39,18 +39,18 @@ exception statement from your version. */
 package javax.print;
 
 /**
- * <code>CancelablePrintJob</code> represents a print job which can be 
+ * <code>CancelablePrintJob</code> represents a print job which can be
  * canceled.
  * <p>
- * It is implemented by <code>DocPrintJob</code>s which support to cancel 
- * a print job during processing. Clients need to explicitly test if a given 
- * <code>DocPrintJob</code> object from a print service implementes this 
+ * It is implemented by <code>DocPrintJob</code>s which support to cancel
+ * a print job during processing. Clients need to explicitly test if a given
+ * <code>DocPrintJob</code> object from a print service implementes this
  * interface and therefore supports cancelling.
  * </p><p>
  * Implementor of java print services should implement this interface if
  * cancelling is supported by the underlying print system. If implemented the
- * corresponding print job event 
- * {@link javax.print.event.PrintJobEvent#JOB_CANCELED} should be delivered to 
+ * corresponding print job event
+ * {@link javax.print.event.PrintJobEvent#JOB_CANCELED} should be delivered to
  * registered clients. Implementations have to be thread-safe.
  * </p>
  *
diff --git a/javax/print/Doc.java b/javax/print/Doc.java
index c489de1b6..d8b6ff082 100644
--- a/javax/print/Doc.java
+++ b/javax/print/Doc.java
@@ -45,29 +45,29 @@ import java.io.Reader;
 import javax.print.attribute.DocAttributeSet;
 
 /**
- * <code>Doc</code> specifies the interface for print services how to obtain 
- * the print data and document specific attributes for printing. 
+ * <code>Doc</code> specifies the interface for print services how to obtain
+ * the print data and document specific attributes for printing.
  * <p>
- * The print data is always passed to a {@link javax.print.DocPrintJob} object 
+ * The print data is always passed to a {@link javax.print.DocPrintJob} object
  * as a <code>Doc</code> object which allows the print services to:
  * <ul>
  * <li>Determine the actual document format of the supplied print data. This
  *  is supplied as a {@link javax.print.DocFlavor} object with the MIME type
  *  and the representation class of the print data.</li>
  * <li>Obtain the print data either in its representation class or depending
- *  on the document format through convenience methods as a 
+ *  on the document format through convenience methods as a
  *  {@link java.io.Reader} or an {@link java.io.InputStream}.</li>
  * <li>Obtain the document's attribute set specifying the attributes which
  *  apply to this document instance.</li>
- * </ul> 
+ * </ul>
  * </p><p>
- * Every method of a <code>Doc</code> implementation has to return always the 
- * same object on every method call. Therefore if the print job consumes the 
- * print data via a stream or a reader object it can read only once the 
- * supplied print data. Implementations of this interface have to be thread 
- * safe. 
+ * Every method of a <code>Doc</code> implementation has to return always the
+ * same object on every method call. Therefore if the print job consumes the
+ * print data via a stream or a reader object it can read only once the
+ * supplied print data. Implementations of this interface have to be thread
+ * safe.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface Doc
@@ -75,20 +75,20 @@ public interface Doc
   /**
    * Returns the unmodifiable view of the attributes of this doc object.
    * <p>
-   * The attributes of this doc's attributes set overrides attributes of 
-   * the same category in the print job's attribute set. If an attribute 
+   * The attributes of this doc's attributes set overrides attributes of
+   * the same category in the print job's attribute set. If an attribute
    * is not available in this doc's attributes set or <code>null</code>
    * is returned the attributes of the same category of the print job are
-   * used. 
+   * used.
    * </p>
-   * 
+   *
    * @return The unmodifiable attributes set, or <code>null</code>.
    */
   DocAttributeSet getAttributes();
 
   /**
    * Returns the flavor of this doc objects print data.
-   * 
+   *
    * @return The document flavor.
    */
   DocFlavor getDocFlavor();
@@ -100,7 +100,7 @@ public interface Doc
    * document flavor ({@link DocFlavor#getRepresentationClassName()})
    * and can be cast to this representation class.
    * </p>
-   * 
+   *
    * @return The print data in the representation class.
    * @throws IOException if representation class is a stream and I/O
    * exception occures.
@@ -118,10 +118,10 @@ public interface Doc
    * <li><code>java.io.Reader</code></li>
    * </ul>
    * otherwise this method returns <code>null</code>.
-   * </p> 
-   * 
+   * </p>
+   *
    * @return The <code>Reader</code> object, or <code>null</code>.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   Reader getReaderForText() throws IOException;
@@ -136,11 +136,11 @@ public interface Doc
    * <li><code>java.io.InputStream</code></li>
    * </ul>
    * otherwise this method returns <code>null</code>.
-   * </p> 
-   * 
+   * </p>
+   *
    * @return The <code>InputStream</code> object, or <code>null</code>.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   InputStream getStreamForBytes() throws IOException;
-}
-\ No newline at end of file
+}
diff --git a/javax/print/DocFlavor.java b/javax/print/DocFlavor.java
index 603059525..b95f46231 100644
--- a/javax/print/DocFlavor.java
+++ b/javax/print/DocFlavor.java
@@ -49,71 +49,71 @@ import java.util.Map;
 import java.util.TreeMap;
 
 /**
- * <code>DocFlavor</code> provides a description of the format in which the 
+ * <code>DocFlavor</code> provides a description of the format in which the
  * print data will be supplied in a print job to the print service.
  * <p>
  * A doc flavor consists of two parts:
  * <ul>
  * <li>
- * The MIME type (Multipurpose Internet Mail Extensions types as described 
+ * The MIME type (Multipurpose Internet Mail Extensions types as described
  * in RFC 2045/2046) specifying the media format of the print data.
  * </li><li>
- * The representation class name which is the fully qualified name of the 
- * class providing the print data to the print job. For example if the print 
- * data is supplied as a byte array the representation class name will be 
+ * The representation class name which is the fully qualified name of the
+ * class providing the print data to the print job. For example if the print
+ * data is supplied as a byte array the representation class name will be
  * <code>"[B"</code> or for an input stream <code>"java.io.InputStream"</code>.
  * </li>
  * </ul>
- * The <code>DocFlavor</code> class is therefore used in several places in the 
- * Java Print Service API. A print service provides its supported document 
+ * The <code>DocFlavor</code> class is therefore used in several places in the
+ * Java Print Service API. A print service provides its supported document
  * flavors as an array of DocFlavor objects and a print job gets the flavor of
  * its data to print from the <code>Doc</code> object provided as a DocFlavor
  * instance.
  * </p>
  * <p>
- * It has to be differentiated between <b>client formatted</b> and <b>service 
- * formatted</b> print data. Client formatted print data is already provided 
- * formatted by the client e.g. in an image format or as postscript. For 
- * service formatted print data, the Java Print Service instance produces 
- * the formatted print data. Here the doc flavor's representation class name 
- * does specify an interface instead of the actual print data source. The 
+ * It has to be differentiated between <b>client formatted</b> and <b>service
+ * formatted</b> print data. Client formatted print data is already provided
+ * formatted by the client e.g. in an image format or as postscript. For
+ * service formatted print data, the Java Print Service instance produces
+ * the formatted print data. Here the doc flavor's representation class name
+ * does specify an interface instead of the actual print data source. The
  * print service will call the methods of the given implementation of this
  * interface with a special Graphics object capable of producing formatted
  * print data from the graphics routines inside the interface methods.
  * </p>
  * <p>
  * <h3>Client formatted print data document flavors</h3>
- * The print service uses the representation class of the doc flavor to know 
- * how to retrieve the print data. If the representation class is a 
- * <code>URL</code> it will open the URL to read the print data from it. If it is 
- * a <code>byte[]</code> it will directly use the array and send it to the 
- * printer. There are predefined doc flavor as inner class for the most common 
+ * The print service uses the representation class of the doc flavor to know
+ * how to retrieve the print data. If the representation class is a
+ * <code>URL</code> it will open the URL to read the print data from it. If it is
+ * a <code>byte[]</code> it will directly use the array and send it to the
+ * printer. There are predefined doc flavor as inner class for the most common
  * representation class types:
  * <ul>
- * <li>Character arrays (<code>char[]</code>): The characters of the array 
+ * <li>Character arrays (<code>char[]</code>): The characters of the array
  * represent the print data.</li>
- * <li>Character streams (<code>java.io.Reader</code>): The whole characters 
+ * <li>Character streams (<code>java.io.Reader</code>): The whole characters
  * read from the stream represent the print data.</li>
- * <li>String (<code>java.lang.String</code>): The characters of the String 
+ * <li>String (<code>java.lang.String</code>): The characters of the String
  * represent the print data.</li>
- * <li>Byte arrays (<code>byte[]</code>): The bytes of the array represent the 
+ * <li>Byte arrays (<code>byte[]</code>): The bytes of the array represent the
  * print data. Encoding if text content is given in the mime type.</li>
- * <li>Byte streams (<code>java.io.InputStream</code>): The whole bytes read 
- * from the stream represent the print data. If text content the encoding is 
+ * <li>Byte streams (<code>java.io.InputStream</code>): The whole bytes read
+ * from the stream represent the print data. If text content the encoding is
  * specified in the mime type.</li>
- * <li>Uniform Resource Locator (<code>java.net.URL</code>): The bytes read 
- * from the stream through opening of the URL represent the print data. 
+ * <li>Uniform Resource Locator (<code>java.net.URL</code>): The bytes read
+ * from the stream through opening of the URL represent the print data.
  * If text content the encoding is specified in the mime type.</li></li>
  * </ul>
  * </p>
  * <p>
  * <h3>Service formatted print data document flavors</h3>
  * The print service uses the provided object implementing the interface
- * specified by the representation class to produce the formatted print data. 
- * The mime type of service formatted data is always 
- * <code>"application/x-java-jvm-local-objectref"</code> to signal the local 
+ * specified by the representation class to produce the formatted print data.
+ * The mime type of service formatted data is always
+ * <code>"application/x-java-jvm-local-objectref"</code> to signal the local
  * reference to the print data object implementing the interface. Predefined
- * doc flavor classes exist as an inner class for the three available interface 
+ * doc flavor classes exist as an inner class for the three available interface
  * to produce print data:
  * <ul>
  * <li>Pageable object (<code>java.awt.print.Pageable</code>): A pageable object
@@ -122,13 +122,13 @@ import java.util.TreeMap;
  * <li>Printable object (<code>java.awt.print.Printable</code>): A printable object
  * is supplied to the print service. The print service will call the methods of
  * the interface with a Grahics object to produce the formatted print data.</li>
- * <li>Renderable Image object 
+ * <li>Renderable Image object
  * (<code>java.awt.image.renderable.RenderableImage</code>): A renderable image
  * object is supplied to the print service. The print service calls methods of
  * this interface to obtain the image to be printed.</li>
  * </ul>
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -137,9 +137,9 @@ public class DocFlavor implements Cloneable, Serializable
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use a byte array for the print data representation.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "[B" (byte array).</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class BYTE_ARRAY
@@ -206,7 +206,7 @@ public class DocFlavor implements Cloneable, Serializable
     /**
      * Byte array doc flavor with a MIME Type of "text/plain; charset=us-ascii".
      */
-    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");    
+    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");
     /**
      * Byte array doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
@@ -223,13 +223,13 @@ public class DocFlavor implements Cloneable, Serializable
      * Byte array doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final BYTE_ARRAY TEXT_PLAIN_UTF_8 = new BYTE_ARRAY("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "[B".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -238,20 +238,20 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "[B");
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use a char array for the print data representation.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "[C" (char array).</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class CHAR_ARRAY
     extends DocFlavor
   {
     private static final long serialVersionUID = -8720590903724405128L;
-    
+
     /**
      * Char array doc flavor with a MIME Type of "text/html; charset=utf-16".
      */
@@ -262,11 +262,11 @@ public class DocFlavor implements Cloneable, Serializable
     public static final DocFlavor.CHAR_ARRAY TEXT_PLAIN = new CHAR_ARRAY("text/plain; charset=utf-16");
 
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "[C".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -275,13 +275,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "[C");
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use an InputStream to retrieve the print data.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "java.io.InputStream".</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class INPUT_STREAM
@@ -365,13 +365,13 @@ public class DocFlavor implements Cloneable, Serializable
      * InputStream doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final INPUT_STREAM TEXT_PLAIN_UTF_8 = new INPUT_STREAM("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.io.InputStream".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -380,13 +380,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.io.InputStream");
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use an Reader to retrieve the print data.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "java.io.Reader".</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class READER
@@ -402,13 +402,13 @@ public class DocFlavor implements Cloneable, Serializable
      * Reader doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
     public static final DocFlavor.READER TEXT_PLAIN = new READER("text/plain; charset=utf-16");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.io.Reader".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -417,13 +417,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.io.Reader");
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use service formatted print data.
-   * <p>All the defined doc flavors have a MIME type of 
+   * <p>All the defined doc flavors have a MIME type of
    * "application/x-java-jvm-local-objectref".</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class SERVICE_FORMATTED
@@ -432,28 +432,28 @@ public class DocFlavor implements Cloneable, Serializable
     private static final long serialVersionUID = 6181337766266637256L;
 
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.print.Pageable".
      */
     public static final DocFlavor.SERVICE_FORMATTED PAGEABLE = new SERVICE_FORMATTED("java.awt.print.Pageable");
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.print.Printable".
      */
     public static final DocFlavor.SERVICE_FORMATTED PRINTABLE = new SERVICE_FORMATTED("java.awt.print.Printable");
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.image.renderable.RenderableImage".
      */
     public static final DocFlavor.SERVICE_FORMATTED RENDERABLE_IMAGE = new SERVICE_FORMATTED("java.awt.image.renderable.RenderableImage");
-    
+
     /**
-     * Constructor for doc flavor objects with a MIME type of 
+     * Constructor for doc flavor objects with a MIME type of
      * "application/x-java-jvm-local-objectref" and the given
      * print data representation classname.
-     * 
+     *
      * @param className the representation classname
-     * 
+     *
      * @throws NullPointerException if className is <code>null</code>.
      */
     public SERVICE_FORMATTED(String className)
@@ -461,13 +461,13 @@ public class DocFlavor implements Cloneable, Serializable
       super("application/x-java-jvm-local-objectref", className);
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which use a String for the print data representation.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "java.lang.String".</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class STRING
@@ -483,13 +483,13 @@ public class DocFlavor implements Cloneable, Serializable
      * String doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
     public static final DocFlavor.STRING TEXT_PLAIN = new STRING("text/plain; charset=utf-16");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.lang.String".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -498,13 +498,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.lang.String");
     }
   }
-  
+
   /**
    * Predefined static <code>DocFlavor</code> objects for document
    * types which have an URL where to retrieve the print data.
-   * <p>All the defined doc flavors have a print data representation 
+   * <p>All the defined doc flavors have a print data representation
    * classname of "java.net.URL".</p>
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class URL
@@ -588,13 +588,13 @@ public class DocFlavor implements Cloneable, Serializable
      * URL doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final DocFlavor.URL TEXT_PLAIN_UTF_8 = new URL("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.net.URL".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is <code>null</code>.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -603,12 +603,12 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.net.URL");
     }
   }
-  
+
   private static final long serialVersionUID = -4512080796965449721L;
-  
+
   /**
    * The string representing the host encoding. This is the encoding
-   * used in the predefined HOST doc flavors 
+   * used in the predefined HOST doc flavors
    * (e.g. {@link BYTE_ARRAY#TEXT_HTML_HOST}).
    */
   public static final String hostEncoding = Charset.defaultCharset().name();
@@ -616,17 +616,17 @@ public class DocFlavor implements Cloneable, Serializable
   private transient String mediaSubtype;
   private transient String mediaType;
   private transient TreeMap params;
-  
+
   // name as defined in Serialized Form JDK 1.4
   private String myClassName;
-  
+
   /**
-   * Constructs a <code>DocFlavor</code> object with the given MIME type and 
+   * Constructs a <code>DocFlavor</code> object with the given MIME type and
    * representation class name.
-   * 
+   *
    * @param mimeType the MIME type string.
    * @param className the fully-qualified name of the representation class.
-   * 
+   *
    * @throws NullPointerException if mimeType or className are <code>null</code>.
    * @throws IllegalArgumentException if given mimeType has syntax errors.
    */
@@ -637,15 +637,15 @@ public class DocFlavor implements Cloneable, Serializable
 
     params = new TreeMap();
     parseMimeType(mimeType);
-    
+
     myClassName = className;
   }
-  
+
   /**
    * Parses the given string as MIME type.
    * The mediatype, mediasubtype and all parameter/value
    * combinations are extracted, comments are dropped.
-   *  
+   *
    * @param mimeType the string to parse
    * @throws IllegalArgumentException if not conformant.
    */
@@ -656,11 +656,11 @@ public class DocFlavor implements Cloneable, Serializable
     int PARAM_NAME = 3;
     int PARAM_VALUE = 4;
     int COMMENT_START = 5;
-    
+
     int state = 0;
     int lastState = 0; // keeps track of state before comment
     int tok;
-    
+
     try
       {
         String paramName = null;
@@ -778,7 +778,7 @@ public class DocFlavor implements Cloneable, Serializable
         throw new InternalError("IOException during parsing String " + mimeType);
       }
   }
-  
+
   /**
    * Checks if this doc flavor object is equal to the given object.
    * <p>
@@ -787,7 +787,7 @@ public class DocFlavor implements Cloneable, Serializable
    * types has to be equal in their media type, media subtype, their
    * paramter/value combinations and the representation classname.
    * </p>
-   * 
+   *
    * @param obj the object to test.
    * @return <code>true</code> if equal, <code>false</code> otherwise.
    */
@@ -799,14 +799,14 @@ public class DocFlavor implements Cloneable, Serializable
     DocFlavor tmp = (DocFlavor) obj;
 
     return (getMimeType().equals(tmp.getMimeType())
-	    && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
+            && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
   }
 
   /**
    * Returns the media subtype of this flavor object.
    * A mimetype of "text/html; charset=us-ascii" will
-   * return "html" as the media subtype. 
-   * 
+   * return "html" as the media subtype.
+   *
    * @return The media subtype.
    */
   public String getMediaSubtype()
@@ -818,7 +818,7 @@ public class DocFlavor implements Cloneable, Serializable
    * Returns the media type of this flavor object.
    * A mimetype of "text/html; charset=us-ascii" will
    * return "text" as the media type.
-   * 
+   *
    * @return The media type.
    */
   public String getMediaType()
@@ -830,7 +830,7 @@ public class DocFlavor implements Cloneable, Serializable
    * Returns the mime type of this flavor object.
    * The mimetype will have every parameter value
    * enclosed in quotes.
-   * 
+   *
    * @return The mime type.
    */
   public String getMimeType()
@@ -840,8 +840,8 @@ public class DocFlavor implements Cloneable, Serializable
 
     while (it.hasNext())
       {
-	Map.Entry entry = (Map.Entry) it.next();
-	mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
+        Map.Entry entry = (Map.Entry) it.next();
+        mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
       }
 
     return mimeType;
@@ -850,7 +850,7 @@ public class DocFlavor implements Cloneable, Serializable
   /**
    * Returns the value for an optional parameter of the mime type of this
    * flavor object.
-   * 
+   *
    * @param paramName the name of the parameter
    * @return The value for the parameter, or <code>null</code> if none bound.
    * @throws NullPointerException if paramName is <code>null</code>.
@@ -859,13 +859,13 @@ public class DocFlavor implements Cloneable, Serializable
   {
     if (paramName == null)
       throw new NullPointerException();
-    
+
     return (String) params.get(paramName.toLowerCase());
   }
 
   /**
    * Returns the name of the representation class of this flavor object.
-   * 
+   *
    * @return The representation classname.
    */
   public String getRepresentationClassName()
@@ -875,30 +875,30 @@ public class DocFlavor implements Cloneable, Serializable
 
   /**
    * Returns a hash code for this doc flavor object.
-   * 
+   *
    * @return The hashcode.
    */
   public int hashCode()
   {
     return ((mediaType.hashCode()
-	     * mediaSubtype.hashCode()
-	     * myClassName.hashCode()) ^ params.hashCode());
+             * mediaSubtype.hashCode()
+             * myClassName.hashCode()) ^ params.hashCode());
   }
 
   /**
    * Returns a string representation of this doc flavor object.
    * The returned string is of the form
    * getMimeType() + "; class=\"" + getRepresentationClassName() + "\"";
-   * 
+   *
    * @return The constructed string representation.
    */
   public String toString()
   {
     return getMimeType() + "; class=\"" + getRepresentationClassName() + "\"";
   }
-  
+
   // needs special treatment for serialization
-  private void readObject(ObjectInputStream stream) 
+  private void readObject(ObjectInputStream stream)
     throws IOException, ClassNotFoundException
   {
     params = new TreeMap();
diff --git a/javax/print/DocPrintJob.java b/javax/print/DocPrintJob.java
index eec4e2afc..ffafa47a5 100644
--- a/javax/print/DocPrintJob.java
+++ b/javax/print/DocPrintJob.java
@@ -44,14 +44,14 @@ import javax.print.event.PrintJobAttributeListener;
 import javax.print.event.PrintJobListener;
 
 /**
- * <code>DocPrintJob</code> represents a print job which supports printing 
- * of a single document. 
+ * <code>DocPrintJob</code> represents a print job which supports printing
+ * of a single document.
  * <p>
- * An instance can be obtained from every <code>PrintService</code> available 
- * by calling the {@link javax.print.PrintService#createPrintJob()} method. 
+ * An instance can be obtained from every <code>PrintService</code> available
+ * by calling the {@link javax.print.PrintService#createPrintJob()} method.
  * A print job is bound to the print service it is created from.
  * </p>
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface DocPrintJob
@@ -63,62 +63,62 @@ public interface DocPrintJob
    * If the given attribute set is empty no changes will be reported.
    * If the set is <code>null</code> all attributes are monitored.
    * </p>
-   * 
+   *
    * @param listener the listener to register.
    * @param attributes the attributes to observe.
-   * 
+   *
    * @see #removePrintJobAttributeListener(PrintJobAttributeListener)
    */
   void addPrintJobAttributeListener(PrintJobAttributeListener listener,
-				    PrintJobAttributeSet attributes);
+                                    PrintJobAttributeSet attributes);
 
   /**
    * Registers a listener for events occuring during processing
    * of this print job.
-   * 
+   *
    * @param listener the listener to add, if <code>null</code> nothing is done.
-   * 
+   *
    * @see #removePrintJobListener(PrintJobListener)
    */
   void addPrintJobListener(PrintJobListener listener);
 
   /**
-   * Returns the print job's attributes. 
+   * Returns the print job's attributes.
    * <p>
-   * The returned set of attributes is a snapshot at the time of calling this 
+   * The returned set of attributes is a snapshot at the time of calling this
    * method and will not be updated if changes to the print job's attributes
    * happens. To monitor changes register a print job listener.
    * </p>
-   * 
-   * @return The attributes of this print job, 
+   *
+   * @return The attributes of this print job,
    * may be empty but never <code>null</code>.
    */
   PrintJobAttributeSet getAttributes();
 
   /**
    * Returns the <code>PrintService</code> object this print job is bound to.
-   * 
+   *
    * @return The print service.
    */
   PrintService getPrintService();
 
   /**
    * Prints a document with the specified print job attributes.
-   * 
+   *
    * <p>
-   * If the doc flavor provided by the <code>Doc</code> implementation is 
-   * not supported by this print service a <code>PrintException</code> 
+   * If the doc flavor provided by the <code>Doc</code> implementation is
+   * not supported by this print service a <code>PrintException</code>
    * implementing the <code>FlavorException</code> interface will be thrown.
    * </p>
-   * 
+   *
    * @param doc the document to print
-   * @param attributes the job attributes to use. If <code>null</code> the 
+   * @param attributes the job attributes to use. If <code>null</code> the
    * default attribute values of the print service will be used.
-   * 
-   * @throws PrintException if an error occurs. The thrown exception may 
-   * implement refining print exception interface to provide more detail of 
+   *
+   * @throws PrintException if an error occurs. The thrown exception may
+   * implement refining print exception interface to provide more detail of
    * the error.
-   * 
+   *
    * @see AttributeException
    * @see FlavorException
    */
@@ -127,22 +127,22 @@ public interface DocPrintJob
   /**
    * Removes the given listener from the listeners registered for changes
    * in their provided attribute set during processing of this print job.
-   * 
+   *
    * @param listener the listener to remove, if <code>null</code> or not
    * registered nothing will be done.
-   * 
+   *
    * @see #addPrintJobAttributeListener(PrintJobAttributeListener, PrintJobAttributeSet)
-   */  
+   */
   void removePrintJobAttributeListener(PrintJobAttributeListener listener);
 
   /**
-   * Removes the given listener from the listeners registered for events 
+   * Removes the given listener from the listeners registered for events
    * occuring during processing of this print job.
-   * 
+   *
    * @param listener the listener to remove, if <code>null</code> or not
    * registered nothing will be done.
-   * 
+   *
    * @see #addPrintJobListener(PrintJobListener)
    */
   void removePrintJobListener(PrintJobListener listener);
-}
-\ No newline at end of file
+}
diff --git a/javax/print/FlavorException.java b/javax/print/FlavorException.java
index 879f10807..3e2fde2f4 100644
--- a/javax/print/FlavorException.java
+++ b/javax/print/FlavorException.java
@@ -44,19 +44,19 @@ package javax.print;
  * provide further information of printing errors if unsupported
  * document flavors are involved.
  * <p>
- * There exists no <code>PrintException</code> class implementing this 
- * interface. Providing this extension in <code>PrintException</code> 
+ * There exists no <code>PrintException</code> class implementing this
+ * interface. Providing this extension in <code>PrintException</code>
  * subclasses is left to the concrete print service implementation.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface FlavorException
 {
   /**
    * Returns the unsupported document flavors.
-   * 
+   *
    * @return The unsupported document flavors.
    */
   DocFlavor[] getUnsupportedFlavors();
-}
-\ No newline at end of file
+}
diff --git a/javax/print/MultiDoc.java b/javax/print/MultiDoc.java
index 6e9ec841f..40a83ab0c 100644
--- a/javax/print/MultiDoc.java
+++ b/javax/print/MultiDoc.java
@@ -46,30 +46,30 @@ import java.io.IOException;
  * documents for use in a print job.
  * <p>
  * Implementations of this interface are used to pass multiple documents, to be
- * printed as one print job, to the <code>MultiDocPrintJob</code> instance.  
+ * printed as one print job, to the <code>MultiDocPrintJob</code> instance.
  * </p><p>
- * There exists no implementation of this interface in the Java Print Service 
+ * There exists no implementation of this interface in the Java Print Service
  * API. Implementors may assume the following usage in print jobs and the needed
- * behaviour for implementations: The print job fetches the single documents via 
- * iteration by consecutive calls of the {@link #getDoc()} method to obtain the 
- * current document follwing calls of the {@link #next()} method to get the next 
+ * behaviour for implementations: The print job fetches the single documents via
+ * iteration by consecutive calls of the {@link #getDoc()} method to obtain the
+ * current document follwing calls of the {@link #next()} method to get the next
  * multidoc object for the next <code>getDoc()</code> method call (if returned
- * multidoc object is not <code>null</code>). The print service will fetch the 
- * document object and then retrieve the print data from the document before it 
+ * multidoc object is not <code>null</code>). The print service will fetch the
+ * document object and then retrieve the print data from the document before it
  * proceeds with the next call for the next MultiDoc object in the sequence.
  * </p><p>
  * Implementations of this interface have to be multiple thread-safe.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDoc
 {
   /**
    * Returns the current document.
-   * 
+   *
    * @return The current document.
-   * 
+   *
    * @throws IOException if an error occurs
    */
   Doc getDoc() throws IOException;
@@ -77,11 +77,11 @@ public interface MultiDoc
   /**
    * Returns the next <code>MultiDoc</code> object that contains the
    * next document for retrieval.
-   * 
+   *
    * @return The next <code>MultiDoc</code> object, or <code>null</code>
    * if no more documents are available.
-   * 
+   *
    * @throws IOException if an error occurs
    */
   MultiDoc next() throws IOException;
-}
-\ No newline at end of file
+}
diff --git a/javax/print/MultiDocPrintJob.java b/javax/print/MultiDocPrintJob.java
index 36089b5d0..c030c4d64 100644
--- a/javax/print/MultiDocPrintJob.java
+++ b/javax/print/MultiDocPrintJob.java
@@ -42,36 +42,35 @@ import javax.print.attribute.PrintRequestAttributeSet;
 
 
 /**
- * <code>MultiDocPrintJob</code> represents a print job which supports 
+ * <code>MultiDocPrintJob</code> represents a print job which supports
  * printing of multiple documents as one print job.
  * <p>
  * An instance can be obtained from every <code>MultiDocPrintService</code>
- * available by calling the 
- * {@link javax.print.MultiDocPrintService#createMultiDocPrintJob()} method. 
+ * available by calling the
+ * {@link javax.print.MultiDocPrintService#createMultiDocPrintJob()} method.
  * A print job is bound to the print service it is created from.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDocPrintJob extends DocPrintJob
 {
   /**
-   * Prints the documents supplied in the given <code>MultiDoc</code> object 
+   * Prints the documents supplied in the given <code>MultiDoc</code> object
    * as one print job with the given printing attributes.
-   * 
-   * @param multiDoc the documents to print. Every document must have a 
+   *
+   * @param multiDoc the documents to print. Every document must have a
    * flavor supported by the bound print service.
-   * @param attributes the printing attributes to apply to the print job. If 
+   * @param attributes the printing attributes to apply to the print job. If
    * <code>null</code> the default attribute values will be used.
-   * 
-   * @throws PrintException if an error occurs. The thrown exception may 
-   * implement refining print exception interface to provide more detail of 
+   *
+   * @throws PrintException if an error occurs. The thrown exception may
+   * implement refining print exception interface to provide more detail of
    * the error.
-   * 
+   *
    * @see FlavorException
    * @see AttributeException
    */
   void print(MultiDoc multiDoc, PrintRequestAttributeSet attributes)
     throws PrintException;
 }
- 
-\ No newline at end of file
diff --git a/javax/print/MultiDocPrintService.java b/javax/print/MultiDocPrintService.java
index 105e72210..b0ebfd15a 100644
--- a/javax/print/MultiDocPrintService.java
+++ b/javax/print/MultiDocPrintService.java
@@ -40,21 +40,21 @@ package javax.print;
 
 
 /**
- * <code>MultiDocPrintService</code> represents print services that are 
- * capable of printing multiple documents as one print job. It provides an 
+ * <code>MultiDocPrintService</code> represents print services that are
+ * capable of printing multiple documents as one print job. It provides an
  * additional method for the creation of a print job for multiple documents.
- * 
+ *
  * @see javax.print.MultiDoc
  * @see javax.print.MultiDocPrintJob
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDocPrintService extends PrintService
 {
   /**
    * Create a job that can print a <code>MultiDoc</code> object.
-   * 
+   *
    * @return The created print job.
    */
   MultiDocPrintJob createMultiDocPrintJob();
-}
-\ No newline at end of file
+}
diff --git a/javax/print/PrintException.java b/javax/print/PrintException.java
index 6fd46b506..8ff29b20c 100644
--- a/javax/print/PrintException.java
+++ b/javax/print/PrintException.java
@@ -42,8 +42,8 @@ package javax.print;
  * <code>PrintException</code> is used to report exceptions during the
  * usage of a print service implementation.
  * <p>
- * This base class only provides the possibility to report a message as 
- * exception. A concrete print service implementation may provide 
+ * This base class only provides the possibility to report a message as
+ * exception. A concrete print service implementation may provide
  * specialised subclasses implementing one or more of the following
  * exception interfaces:<br>
  * <ul>
@@ -52,7 +52,7 @@ package javax.print;
  * <li>{@link javax.print.URIException}</li>
  * </ul>
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintException extends Exception
@@ -67,7 +67,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param e chained exception
    */
   public PrintException(Exception e)
@@ -77,7 +77,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param s detailed message, or null for no message
    */
   public PrintException(String s)
@@ -87,7 +87,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param s detailed message, or null for no message
    * @param e chained exception
    */
@@ -95,4 +95,4 @@ public class PrintException extends Exception
   {
     super(s, e);
   }
-}
-\ No newline at end of file
+}
diff --git a/javax/print/PrintService.java b/javax/print/PrintService.java
index 125d27083..b7bd50088 100644
--- a/javax/print/PrintService.java
+++ b/javax/print/PrintService.java
@@ -48,57 +48,57 @@ import javax.print.event.PrintServiceAttributeListener;
  * A <code>PrintService</code> represents a printer available for printing.
  * <p>
  * The print service hereby may be a real physical printer device, a printer
- * group with same capabilities or a logical print service (like for example 
+ * group with same capabilities or a logical print service (like for example
  * a PDF writer). The print service is used to query the capabilities of the
  * represented printer instance. If a suitable print service is found it is
- * used to create a print job for the actual printing process. 
+ * used to create a print job for the actual printing process.
  * </p>
  * @see javax.print.DocPrintJob
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintService
 {
   /**
-   * Creates and returns a new print job which is capable to handle all 
+   * Creates and returns a new print job which is capable to handle all
    * the document flavors supported by this print service.
-   * 
+   *
    * @return The created print job object.
    */
   DocPrintJob createPrintJob();
-  
+
   /**
    * Determines if two services refer to the same underlying service.
-   * 
+   *
    * @param obj the service to check against
-   * 
+   *
    * @return <code>true</code> if both services refer to the same underlying
    * service, <code>false</code> otherwise.
    */
   boolean equals(Object obj);
-  
+
   /**
    * Returns the value of the single specified attribute.
-   * 
+   *
    * @param category the category of a <code>PrintServiceAttribute</code>
-   * 
+   *
    * @return The value of the attribute, or <code>null</code> if the attribute
    * category is not supported by this print service implementation.
-   * 
+   *
    * @throws NullPointerException if category is <code>null</code>.
    * @throws IllegalArgumentException if category is not a class that
    * implements <code>PrintServiceAttribute</code>.
    */
   <T extends PrintServiceAttribute> T getAttribute(Class<T> category);
-  
+
   /**
-   * Returns the attributes describing this print service. The returned 
+   * Returns the attributes describing this print service. The returned
    * attributes set is unmodifiable and represents the current state of
-   * the print service. As some print service attributes may change 
+   * the print service. As some print service attributes may change
    * (depends on the print service implementation) a subsequent call to
-   * this method may return a different set. To monitor changes a 
-   * <code>PrintServiceAttributeListener</code> may be registered. 
-   * 
+   * this method may return a different set. To monitor changes a
+   * <code>PrintServiceAttributeListener</code> may be registered.
+   *
    * @return All the description attributes of this print service.
    * @see #addPrintServiceAttributeListener(PrintServiceAttributeListener)
    */
@@ -111,67 +111,67 @@ public interface PrintService
    * A return value of <code>null</code> means either that the print service
    * does not support the attribute category or there is no default value
    * available for this category. To distinguish these two case one can test
-   * with {@link #isAttributeCategorySupported(Class)} if the category is 
+   * with {@link #isAttributeCategorySupported(Class)} if the category is
    * supported.
    * </p>
-   * 
+   *
    * @param category the category of the attribute
-   * 
+   *
    * @return The default value, or <code>null</code>.
-   * 
+   *
    * @throws NullPointerException if <code>category</code> is <code>null</code>
    * @throws IllegalArgumentException if <code>category</code> is a class
-   * not implementing <code>Attribute</code> 
+   * not implementing <code>Attribute</code>
    */
   Object getDefaultAttributeValue(Class<? extends Attribute> category);
-  
+
   /**
    * Returns the name of this print service.
    * This may be the value of the <code>PrinterName</code> attribute.
-   * 
+   *
    * @return The print service name.
    */
   String getName();
-  
+
   /**
    * Returns a factory for UI components if supported by the print service.
-   * 
+   *
    * @return A factory for UI components or <code>null</code>.
    */
   ServiceUIFactory getServiceUIFactory();
-  
+
   /**
    * Returns all supported attribute categories.
-   * 
+   *
    * @return The class array of all supported attribute categories.
    */
   Class<?>[] getSupportedAttributeCategories();
-  
+
   /**
-   * Determines and returns all supported attribute values of a given 
-   * attribute category a client can use when setting up a print job 
-   * for this print service. 
+   * Determines and returns all supported attribute values of a given
+   * attribute category a client can use when setting up a print job
+   * for this print service.
    * <p>
    * The returned object may be one of the following types:
    * <ul>
-   * <li>A single instance of the attribute category to indicate that any 
+   * <li>A single instance of the attribute category to indicate that any
    * value will be supported.</li>
-   * <li>An array of the same type as the attribute category to test, 
+   * <li>An array of the same type as the attribute category to test,
    * containing all the supported values for this category.</li>
-   * <li>A single object (of any other type than the attribute category) 
-   * which indicates bounds on the supported values.</li> 
-   * </ul> 
+   * <li>A single object (of any other type than the attribute category)
+   * which indicates bounds on the supported values.</li>
+   * </ul>
    * </p>
-   * 
+   *
    * @param category the attribute category to test
    * @param flavor the document flavor to use, or <code>null</code>
-   * @param attributes set of attributes for a supposed job, 
+   * @param attributes set of attributes for a supposed job,
    * or <code>null</code>
-   * 
-   * @return A object (as defined above) indicating the supported values 
-   * for the given attribute category, or <code>null</code> if this print 
+   *
+   * @return A object (as defined above) indicating the supported values
+   * for the given attribute category, or <code>null</code> if this print
    * service doesn't support the given attribute category at all.
-   * 
+   *
    * @throws NullPointerException if <code>category</code> is null
    * @throws IllegalArgumentException if <code>category</code> is a class not
    * implementing <code>Attribute</code>, or if <code>flavor</code> is not
@@ -180,116 +180,116 @@ public interface PrintService
   Object getSupportedAttributeValues(Class<? extends Attribute> category,
                                      DocFlavor flavor,
                                      AttributeSet attributes);
-  
+
   /**
    * Determines and returns an array of all supported document flavors which
-   * can be used to supply print data to this print service. 
+   * can be used to supply print data to this print service.
    * <p>
    * The supported attribute categories may differ between the supported
    * document flavors. To test for supported attributes one can use the
    * {@link #getUnsupportedAttributes(DocFlavor, AttributeSet)} method with
    * the specific doc flavor and attributes set.
    * </p>
-   * 
+   *
    * @return the supported document flavors
    */
   DocFlavor[] getSupportedDocFlavors();
-  
+
   /**
    * Identifies all the unsupported attributes of the given set of attributes
-   * in the context of the specified document flavor. 
+   * in the context of the specified document flavor.
    * <p>
-   * The given flavor has to be supported by the print service (use 
-   * {@link #isDocFlavorSupported(DocFlavor)} to verify). The method will 
+   * The given flavor has to be supported by the print service (use
+   * {@link #isDocFlavorSupported(DocFlavor)} to verify). The method will
    * return <code>null</code> if all given attributes are supported. Otherwise
    * a set of unsupported attributes are returned. The attributes in the
    * returned set may be completely unsupported or only the specific requested
-   * value. If flavor is <code>null</code> the default document flavor of the 
+   * value. If flavor is <code>null</code> the default document flavor of the
    * print service is used in the identification process.
    * </p>
-   * 
+   *
    * @param flavor document flavor to test, or <code>null</code>.
    * @param attributes set of printing attributes for a supposed job
-   * 
-   * @return <code>null</code> if this print service supports all the given 
+   *
+   * @return <code>null</code> if this print service supports all the given
    * attributes for the specified doc flavor. Otherwise the set of unsupported
    * attributes are returned.
-   * 
+   *
    * @throws IllegalArgumentException if <code>flavor</code> is unsupported
    */
   AttributeSet getUnsupportedAttributes(DocFlavor flavor, AttributeSet attributes);
 
-  
+
   /**
    * Returns a hashcode for this print service.
-   * 
+   *
    * @return The hashcode.
    */
   int hashCode();
-  
+
   /**
-   * Determines a given attribute category is supported by this 
+   * Determines a given attribute category is supported by this
    * print service implementation. This only tests for the category
    * not for any specific values of this category nor in the context
    * of a specific document flavor.
-   * 
+   *
    * @param category the category to check
-   * 
+   *
    * @return <code>true</code> if <code>category</code> is supported,
    * <code>false</code> otherwise.
-   * 
+   *
    * @throws NullPointerException if <code>category</code> is <code>null</code>
    * @throws IllegalArgumentException if <code>category</code> is a class not
    * implementing <code>Attribute</code>.
    */
   boolean isAttributeCategorySupported(Class<? extends Attribute> category);
-  
+
   /**
-   * Determines if a given attribute value is supported when creating a print 
-   * job for this print service. 
+   * Determines if a given attribute value is supported when creating a print
+   * job for this print service.
    * <p>
-   * If either the document flavor or the provided attributes are 
-   * <code>null</code> it is determined if the given attribute value is 
+   * If either the document flavor or the provided attributes are
+   * <code>null</code> it is determined if the given attribute value is
    * supported in some combination of the available document flavors and
    * attributes of the print service. Otherwise it is checked for the
    * specific context of the given document flavor/attributes set.
    * </p>
-   * 
+   *
    * @param attrval the attribute value to check
    * @param flavor the document flavor to use, or <code>null</code>.
    * @param attributes set of attributes to use, or <code>null</code>.
-   * 
+   *
    * @return <code>true</code> if the attribute value is supported in the
    * requested context, <code>false</code> otherwise.
-   * 
+   *
    * @throws NullPointerException if <code>attrval</code> is <code>null</code>.
    * @throws IllegalArgumentException if <code>flavor</code> is not supported
    * by this print service
    */
   boolean isAttributeValueSupported(Attribute attrval, DocFlavor flavor, AttributeSet attributes);
-  
+
   /**
    * Determines if a given document flavor is supported or not.
-   * 
+   *
    * @param flavor the document flavor to check
-   * 
+   *
    * @return <code>true</code> if <code>flavor</code> is supported,
    * <code>false</code> otherwise.
-   * 
+   *
    * @throws NullPointerException if <code>flavor</code> is null.
    */
   boolean isDocFlavorSupported(DocFlavor flavor);
-  
+
   /**
    * Registers a print service attribute listener to this print service.
-   * 
+   *
    * @param listener the listener to add
    */
   void addPrintServiceAttributeListener(PrintServiceAttributeListener listener);
-  
+
   /**
    * De-registers a print service attribute listener from this print service.
-   * 
+   *
    * @param listener the listener to remove
    */
   void removePrintServiceAttributeListener(PrintServiceAttributeListener listener);
diff --git a/javax/print/PrintServiceLookup.java b/javax/print/PrintServiceLookup.java
index 57cb8dc9f..1ea1f9547 100644
--- a/javax/print/PrintServiceLookup.java
+++ b/javax/print/PrintServiceLookup.java
@@ -50,54 +50,54 @@ import javax.print.attribute.AttributeSet;
 
 
 /**
- * <code>PrintServiceLookup</code> implementations provide a way to lookup 
+ * <code>PrintServiceLookup</code> implementations provide a way to lookup
  * print services based on different constraints.
  * <p>
- * Implementations are located and loaded automatically through the SPI JAR 
- * file specification. Therefore implementation classes must provide a default 
- * constructor for instantiation. Furthermore, applications are able to 
+ * Implementations are located and loaded automatically through the SPI JAR
+ * file specification. Therefore implementation classes must provide a default
+ * constructor for instantiation. Furthermore, applications are able to
  * register further instances directly at runtime.
  * </p><p>
- * If an SecurityManager is installed implementors should call 
- * <code>checkPrintJobAccess()</code> to disable access for untrusted code. 
- * This check is to be made in every lookup service implementation for 
- * flexibility. Print services registered by applications through 
- * <code>registerService(PrintService)</code> are suppressed in the 
- * lookup results if a security manager is installed and disallows access. 
+ * If an SecurityManager is installed implementors should call
+ * <code>checkPrintJobAccess()</code> to disable access for untrusted code.
+ * This check is to be made in every lookup service implementation for
+ * flexibility. Print services registered by applications through
+ * <code>registerService(PrintService)</code> are suppressed in the
+ * lookup results if a security manager is installed and disallows access.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class PrintServiceLookup
 {
-  
+
   private static final CupsPrintServiceLookup systemProvider;
   private static final HashSet printServices;
   private static final HashSet printServiceLookups;
-  
+
   static
   {
     systemProvider = new CupsPrintServiceLookup();
-    
+
     printServices = new HashSet();
     printServiceLookups = new HashSet();
-    
+
     // check for service providers
     Iterator it = ServiceFactory.lookupProviders(PrintServiceLookup.class);
-    
+
     while (it.hasNext())
-      printServiceLookups.add(it.next());    
-  }  
-  
+      printServiceLookups.add(it.next());
+  }
+
   /**
    * Constructs a <code>PrintServiceLookup</code> object.
    */
   public PrintServiceLookup()
   {
-    // nothing to do here 
+    // nothing to do here
   }
-  
+
   /**
    * Explicitly registers the provided print service lookup implementation.
    * <p>
@@ -106,22 +106,22 @@ public abstract class PrintServiceLookup
    * else fails.
    * </p>
    *
-   * @param sp the print service lookup implementation to register. 
+   * @param sp the print service lookup implementation to register.
    * @return <code>true</code> if registered, <code>false</code> otherwise.
    */
   public static boolean registerServiceProvider(PrintServiceLookup sp)
-  {  
+  {
     return printServiceLookups.add(sp);
   }
-  
+
   /**
    * Explicitly registers the provided print service instance.
    * <p>
    * The registration will silently fail (returning <code>false</code>) if
-   * the print service instance is already registered or the registration 
+   * the print service instance is already registered or the registration
    * somehow else fails.
    * </p>
-   * @param service the single print service to register. 
+   * @param service the single print service to register.
    * @return <code>true</code> if registered, <code>false</code> otherwise.
    */
   public static boolean registerService(PrintService service)
@@ -143,78 +143,78 @@ public abstract class PrintServiceLookup
         return false;
       }
   }
-  
+
   /**
    * Searches print services capable of printing in the given document flavor
    * which supports the specified printing attributes.
-   * 
-   * @param flavor the document flavor to support. If <code>null</code> this 
+   *
+   * @param flavor the document flavor to support. If <code>null</code> this
    * constraint is ignored during lookup.
-   * @param attributes the printing attributes to support. If 
+   * @param attributes the printing attributes to support. If
    * <code>null</code> this constraint is ignored during lookup.
-   * @return The resulting available print services, or an array of length 0 
-   * if none is found. 
+   * @return The resulting available print services, or an array of length 0
+   * if none is found.
    */
   public static final PrintService[] lookupPrintServices(DocFlavor flavor,
     AttributeSet attributes)
-  {   
+  {
     ArrayList result = new ArrayList();
-    
-    PrintService[] services = 
-      systemProvider.getPrintServices(flavor, attributes);    
+
+    PrintService[] services =
+      systemProvider.getPrintServices(flavor, attributes);
     result.addAll(Arrays.asList(services));
-             
+
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         PrintServiceLookup lookup = (PrintServiceLookup) it.next();
-        services = lookup.getPrintServices(flavor, attributes);   
+        services = lookup.getPrintServices(flavor, attributes);
         result.addAll(Arrays.asList(services));
       }
-    
+
     for (Iterator it = printServices.iterator(); it.hasNext(); )
       {
         PrintService service = (PrintService) it.next();
-        if (systemProvider.checkPrintService(flavor, attributes, service)) 
+        if (systemProvider.checkPrintService(flavor, attributes, service))
           result.add(service);
       }
-    
+
     return (PrintService[]) result.toArray(new PrintService[result.size()]);
   }
-  
+
   /**
-   * Searches print services capable of multi document printing in all of the 
+   * Searches print services capable of multi document printing in all of the
    * given document flavors and supporting the specified printing attributes.
-   * 
-   * @param flavors the document flavors to support. If <code>null</code> this 
+   *
+   * @param flavors the document flavors to support. If <code>null</code> this
    * constraint is ignored during lookup.
-   * @param attributes the printing attributes to support. If 
+   * @param attributes the printing attributes to support. If
    * <code>null</code> this constraint is ignored during lookup.
-   * @return The resulting available multi document print services, or an 
-   * array of length 0 if none is found. 
+   * @return The resulting available multi document print services, or an
+   * array of length 0 if none is found.
    */
   public static final MultiDocPrintService[] lookupMultiDocPrintServices(
     DocFlavor[] flavors, AttributeSet attributes)
   {
     ArrayList result = new ArrayList();
-    
-    MultiDocPrintService[] services = 
-      systemProvider.getMultiDocPrintServices(flavors, attributes);    
+
+    MultiDocPrintService[] services =
+      systemProvider.getMultiDocPrintServices(flavors, attributes);
     result.addAll(Arrays.asList(services));
-             
+
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         PrintServiceLookup lookup = (PrintServiceLookup) it.next();
-        services = lookup.getMultiDocPrintServices(flavors, attributes);   
+        services = lookup.getMultiDocPrintServices(flavors, attributes);
         result.addAll(Arrays.asList(services));
       }
-    
+
     for (Iterator it = printServices.iterator(); it.hasNext(); )
       {
         PrintService service = (PrintService) it.next();
-        if (systemProvider.checkMultiDocPrintService(flavors, attributes, service))   
+        if (systemProvider.checkMultiDocPrintService(flavors, attributes, service))
           result.add(service);
       }
-    
+
     return (MultiDocPrintService[]) result.toArray(
       new MultiDocPrintService[result.size()]);
   }
@@ -224,32 +224,32 @@ public abstract class PrintServiceLookup
    * Searches the default print service in the current environment.
    * <p>
    * If multiple lookup services are registered and each has a default
-   * print service the result is not specified. Usually the default 
+   * print service the result is not specified. Usually the default
    * print service of the native platform lookup service is returned.
    * </p><p>
    * The GNU classpath implementation will return the CUPS default
    * printing service as the default print service, if available.
    * </p><p>
    * The default print service may be overriden by users through
-   * the property <code>javax.print.defaultPrinter</code>. A service 
+   * the property <code>javax.print.defaultPrinter</code>. A service
    * specified must be found to be returned as the default.
    * </p>
-   *  
+   *
    * @return The default print service, or <code>null</code> if none found.
    */
   public static final PrintService lookupDefaultPrintService()
   {
     // TODO Find out what the property controls and use it
     // String defaultPrinter = System.getProperty("javax.print.defaultPrinter");
-       
+
     // first test for platform specified default services
     PrintService service = systemProvider.getDefaultPrintService();
-    
-    if (service != null) 
+
+    if (service != null)
       return service;
-          
+
     // none available by systemDefaultProvider
-    // search in other registered ones and take first      
+    // search in other registered ones and take first
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         service = ((PrintServiceLookup) it.next()).getDefaultPrintService();
@@ -259,10 +259,10 @@ public abstract class PrintServiceLookup
 
     return null;
   }
-  
+
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @return The default lookup service of the implementing lookup service or
    * <code>null</code> if there is no default one.
    */
@@ -270,34 +270,34 @@ public abstract class PrintServiceLookup
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @param flavors the document flavors which have to be supported.
    * @param attributes the attributes which have to be supported.
-   * 
+   *
    * @return The multidoc print services of the implementing lookup service
    * for the given parameters, or an array of length 0 if none is available.
    */
-  public abstract MultiDocPrintService[] 
+  public abstract MultiDocPrintService[]
     getMultiDocPrintServices(DocFlavor[] flavors, AttributeSet attributes);
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @return All known print services of the implementing lookup service
-   * regardless of supported features, or an array of length 0 if none is 
+   * regardless of supported features, or an array of length 0 if none is
    * available.
    */
   public abstract PrintService[] getPrintServices();
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @param flavor the document flavor which has to be supported.
    * @param attributes the attributes which have to be supported.
-   * 
+   *
    * @return The print services of the implementing lookup service
    * for the given parameters, or an array of length 0 if none is available.
    */
-  public abstract PrintService[] 
+  public abstract PrintService[]
     getPrintServices(DocFlavor flavor, AttributeSet attributes);
 }
diff --git a/javax/print/ServiceUI.java b/javax/print/ServiceUI.java
index 4a7b5bd4a..fa5086e85 100644
--- a/javax/print/ServiceUI.java
+++ b/javax/print/ServiceUI.java
@@ -1,4 +1,4 @@
-/* ServiceUI.java -- 
+/* ServiceUI.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,19 +48,19 @@ import java.util.Arrays;
 import javax.print.attribute.PrintRequestAttributeSet;
 
 /**
- * <code>ServiceUI</code> provides a method to create a graphical 
+ * <code>ServiceUI</code> provides a method to create a graphical
  * print dialog.
  * <p>
  * The graphical print dialog enables the user to browse the available
- * print services on the system. It provides user interfaces to interact 
- * with the most common printing attributes likes specifying the number of 
+ * print services on the system. It provides user interfaces to interact
+ * with the most common printing attributes likes specifying the number of
  * copies to print or the page ranges.
  * </p><p>
- * The initial appearance of the print dialog as shown to the user may be 
- * specified by providing the default selected print service as well as 
+ * The initial appearance of the print dialog as shown to the user may be
+ * specified by providing the default selected print service as well as
  * initial values for the printing attributes in the user interface.
  * </p>
- * 
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class ServiceUI
@@ -73,65 +73,65 @@ public class ServiceUI
   {
     // nothing to do here - only one static method
   }
-  
+
   /**
-   * Creates a modal graphical printing dialog at the specified location on 
+   * Creates a modal graphical printing dialog at the specified location on
    * the screen.
    * <p>
-   * The dialog will return the user selected print service and the given 
-   * attributes set will contain the modified printing attributes. If the 
-   * user cancels the printing dialog <code>null</code> will be returned and 
+   * The dialog will return the user selected print service and the given
+   * attributes set will contain the modified printing attributes. If the
+   * user cancels the printing dialog <code>null</code> will be returned and
    * the printing attributes set will be unmodified.
    * </p><p>
    * The values of the given attributes set (if not empty) will be displayed
-   * initially unless the are unsupported by the print service. If a print 
+   * initially unless the are unsupported by the print service. If a print
    * service does not support a particular value it is substituted with the
    * default value of the print service.
-   * </p> 
-   * 
+   * </p>
+   *
    * @param gc the screen to use. <code>null</code> is default screen.
-   * @param x the coordinate of the upper left edge of the dialog in screen 
+   * @param x the coordinate of the upper left edge of the dialog in screen
    *   coordinates (not relative to the parent frame).
-   * @param y the coordinate of the upper left edge of the dialog in screen 
+   * @param y the coordinate of the upper left edge of the dialog in screen
    *   coordinates (not relative to the parent frame).
    * @param services the print services to browse (not null).
    * @param defaultService the default service. If <code>null</code>
    * the first of the print services in the services array will be used.
    * @param flavor the flavours to be printed.
-   * @param attributes the attributes requested. Will be updated 
-   * by selections done by the user in the dialog. 
-   * 
+   * @param attributes the attributes requested. Will be updated
+   * by selections done by the user in the dialog.
+   *
    * @return The selected print service or <code>null</code> if user
    * has cancelled the printer dialog.
-   * 
+   *
    * @throws HeadlessException if GraphicsEnvironment is headless
-   * @throws IllegalArgumentException if services is <code>null</code> or an 
-   * empty array, attributes are <code>null</code> or the given default 
+   * @throws IllegalArgumentException if services is <code>null</code> or an
+   * empty array, attributes are <code>null</code> or the given default
    * <code>PrintService<code> is not part of the print service array.
    */
-  public static PrintService printDialog(GraphicsConfiguration gc, int x, 
+  public static PrintService printDialog(GraphicsConfiguration gc, int x,
       int y, PrintService[] services, PrintService defaultService,
       DocFlavor flavor, PrintRequestAttributeSet attributes)
     throws HeadlessException
-    {       
+    {
       if (GraphicsEnvironment.isHeadless())
         throw new HeadlessException("GraphicsEnvironment is headless.");
-      
+
       if (services == null || services.length == 0 || attributes == null)
-        throw new IllegalArgumentException("Given print service array / " 
+        throw new IllegalArgumentException("Given print service array / "
                                            + "attributes may not be null");
-      
-      if (defaultService != null && 
+
+      if (defaultService != null &&
           ! Arrays.asList(services).contains(defaultService))
-        throw new IllegalArgumentException("defaultService is not contained " 
+        throw new IllegalArgumentException("defaultService is not contained "
                                            + " in the print service array");
-      
-      PrinterDialog dialog = new PrinterDialog(gc, services, defaultService, 
+
+      PrinterDialog dialog = new PrinterDialog(gc, services, defaultService,
                                                flavor, attributes);
-      
+
       dialog.setLocation(x, y);
       dialog.show();
-      
+
       return dialog.getSelectedPrintService();
     }
 }
diff --git a/javax/print/ServiceUIFactory.java b/javax/print/ServiceUIFactory.java
index 1a5c1cfe2..4b660b683 100644
--- a/javax/print/ServiceUIFactory.java
+++ b/javax/print/ServiceUIFactory.java
@@ -39,46 +39,46 @@ exception statement from your version. */
 package javax.print;
 
 /**
- * <code>ServiceUIFactory</code> enables print services to provide additional 
+ * <code>ServiceUIFactory</code> enables print services to provide additional
  * user interface dialogs.
  * <p>
- * A print service may provide a <code>ServiceUIFactory</code> implementation 
+ * A print service may provide a <code>ServiceUIFactory</code> implementation
  * if its <code>getServiceUIFactory()</code> method is called. If a factory
- * object is returned it can be queried for provided user interface dialogs. 
+ * object is returned it can be queried for provided user interface dialogs.
  * Different roles are defined to denote dialogs providing informations about
- * the print service, dialogs for administration of a print service and for 
+ * the print service, dialogs for administration of a print service and for
  * end-user browsing dialogs.
  * </p><p>
- * The factory can support providing these UI roles in different dialog types 
+ * The factory can support providing these UI roles in different dialog types
  * (AWT, Swing, JComponent, Panel). The support and use of Swing interfaces is
  * however preferred.
  * </p>
- * 
+ *
  * @author Michael Koch
  */
 public abstract class ServiceUIFactory
 {
   /** A user interface providing informations about the print service. */
   public static final int ABOUT_UIROLE = 1;
-  
+
   /** A user interface to administer the print service. */
   public static final int ADMIN_UIROLE = 2;
-  
+
   /** A user interface for end-user browsing of the print service. */
   public static final int MAIN_UIROLE = 3;
-  
+
   /** Role IDs greater than this may be used for other private roles. */
   public static final int RESERVED_UIROLE = 99;
 
   /** Identifies a UI provided as an AWT dialog. */
   public static final String DIALOG_UI = "java.awt.Dialog";
-  
+
   /** Identifies a UI provided as a Swing JComponent. */
   public static final String JCOMPONENT_UI = "javax.swing.JComponent";
-  
+
   /** Identifies a UI provided as a Swing JDialog. */
   public static final String JDIALOG_UI = "javax.swing.JDialog";
-  
+
   /** Identifies a UI provided as an AWT Panel. */
   public static final String PANEL_UI = "java.awt.Panel";
 
@@ -87,18 +87,18 @@ public abstract class ServiceUIFactory
    */
   public ServiceUIFactory()
   {
-  	// Do nothing here.
+        // Do nothing here.
   }
 
   /**
    * Returns an UI object which may be cast to the requested UI type.
-   * 
+   *
    * @param role the role requested. Must be one of the standard roles
    * or a private role supported by this factory
    * @param ui type in which the role is requested
-   * 
+   *
    * @return the UI role or null of this role is not supported by this factory
-   * 
+   *
    * @throws IllegalArgumentException if <code>role</code> is neither one of
    * the standard ones nor a private one supported by this factory
    */
@@ -106,13 +106,13 @@ public abstract class ServiceUIFactory
 
   /**
    * Returns the UI types supported by this factory for an UI role.
-   * 
+   *
    * @param role the role to be looked up
-   * 
+   *
    * @return an array of UI types
-   * 
+   *
    * @throws IllegalArgumentException if <code>role</code> is neither one of
    * the standard ones nor a private one supported by this factory
    */
   public abstract String[] getUIClassNamesForRole(int role);
-}
-\ No newline at end of file
+}
diff --git a/javax/print/SimpleDoc.java b/javax/print/SimpleDoc.java
index a49406bcb..16b2d8225 100644
--- a/javax/print/SimpleDoc.java
+++ b/javax/print/SimpleDoc.java
@@ -1,4 +1,4 @@
-/* SimpleDoc.java -- 
+/* SimpleDoc.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -49,23 +49,23 @@ import javax.print.attribute.AttributeSetUtilities;
 import javax.print.attribute.DocAttributeSet;
 
 /**
- * Simple implementation of the <code>Doc</code> interface capable of handling 
+ * Simple implementation of the <code>Doc</code> interface capable of handling
  * the predefined document flavors of <code>DocFlavor</code>.
  * <p>
- * This implementation can construct a reader or stream for the service from 
+ * This implementation can construct a reader or stream for the service from
  * the print data and ensures that always the same object is returned on each
- * method call. It does simple checks that the supplied data matches the 
+ * method call. It does simple checks that the supplied data matches the
  * specified flavor of the doc object and supports thread safe access.
- * </p> 
- * 
+ * </p>
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public final class SimpleDoc implements Doc
-{  
+{
   private final Object printData;
   private final DocFlavor flavor;
   private final DocAttributeSet attributes;
-  
+
   private InputStream stream;
   private Reader reader;
 
@@ -74,17 +74,17 @@ public final class SimpleDoc implements Doc
    * @param printData the object with the data to print.
    * @param flavor the document flavor of the print data.
    * @param attributes the attributes of the doc (may be <code>null</code>).
-   * 
+   *
    * @throws IllegalArgumentException if either <code>printData</code> or
    *   <code>flavor</code> are <code>null</code>, or the print data is not
    *   supplied in the document format specified by the given flavor object.
    */
-  public SimpleDoc(Object printData, DocFlavor flavor, 
+  public SimpleDoc(Object printData, DocFlavor flavor,
       DocAttributeSet attributes)
   {
     if (printData == null || flavor == null)
       throw new IllegalArgumentException("printData/flavor may not be null");
-    
+
     if (! (printData.getClass().getName().equals(
            flavor.getRepresentationClassName())
         || flavor.getRepresentationClassName().equals("java.io.Reader")
@@ -93,16 +93,16 @@ public final class SimpleDoc implements Doc
            && printData instanceof InputStream))
       {
         throw new IllegalArgumentException("data is not of declared flavor type");
-      }          
-    
+      }
+
     this.printData = printData;
     this.flavor = flavor;
-    
+
     if (attributes != null)
       this.attributes = AttributeSetUtilities.unmodifiableView(attributes);
     else
       this.attributes = null;
-    
+
     stream = null;
     reader = null;
   }
@@ -110,13 +110,13 @@ public final class SimpleDoc implements Doc
   /**
    * Returns the unmodifiable view of the attributes of this doc object.
    * <p>
-   * The attributes of this doc's attributes set overrides attributes of 
-   * the same category in the print job's attribute set. If an attribute 
+   * The attributes of this doc's attributes set overrides attributes of
+   * the same category in the print job's attribute set. If an attribute
    * is not available in this doc's attributes set or <code>null</code>
    * is returned the attributes of the same category of the print job are
-   * used. 
+   * used.
    * </p>
-   * 
+   *
    * @return The unmodifiable attributes set, or <code>null</code>.
    */
   public DocAttributeSet getAttributes()
@@ -126,7 +126,7 @@ public final class SimpleDoc implements Doc
 
   /**
    * Returns the flavor of this doc objects print data.
-   * 
+   *
    * @return The document flavor.
    */
   public DocFlavor getDocFlavor()
@@ -141,7 +141,7 @@ public final class SimpleDoc implements Doc
    * document flavor ({@link DocFlavor#getRepresentationClassName()})
    * and can be cast to this representation class.
    * </p>
-   * 
+   *
    * @return The print data in the representation class.
    * @throws IOException if representation class is a stream and I/O
    * exception occures.
@@ -162,10 +162,10 @@ public final class SimpleDoc implements Doc
    * <li><code>java.io.Reader</code></li>
    * </ul>
    * otherwise this method returns <code>null</code>.
-   * </p> 
-   * 
+   * </p>
+   *
    * @return The <code>Reader</code> object, or <code>null</code>.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   public Reader getReaderForText() throws IOException
@@ -182,9 +182,9 @@ public final class SimpleDoc implements Doc
             else if (flavor instanceof DocFlavor.READER)
               reader = (Reader) printData;
           }
-        
+
         return reader;
-      }   
+      }
   }
 
   /**
@@ -197,10 +197,10 @@ public final class SimpleDoc implements Doc
    * <li><code>java.io.InputStream</code></li>
    * </ul>
    * otherwise this method returns <code>null</code>.
-   * </p> 
-   * 
+   * </p>
+   *
    * @return The <code>InputStream</code> object, or <code>null</code>.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   public InputStream getStreamForBytes() throws IOException
@@ -215,9 +215,9 @@ public final class SimpleDoc implements Doc
             else if (flavor instanceof DocFlavor.INPUT_STREAM)
               stream = (InputStream) printData;
           }
-        
+
         return stream;
-      }    
+      }
   }
 
 }
diff --git a/javax/print/StreamPrintService.java b/javax/print/StreamPrintService.java
index 8398a734c..4b82ef767 100644
--- a/javax/print/StreamPrintService.java
+++ b/javax/print/StreamPrintService.java
@@ -46,21 +46,21 @@ import java.io.OutputStream;
  * printing into a supplied output stream.
  * <p>
  * Beside providing the same functionality as a print service it additionally
- * allows to specify the output stream for the print data. A stream print 
- * service is obtained via the {@link javax.print.StreamPrintServiceFactory} 
+ * allows to specify the output stream for the print data. A stream print
+ * service is obtained via the {@link javax.print.StreamPrintServiceFactory}
  * by looking for services supporting a given output format type.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class StreamPrintService implements PrintService
 {
   private boolean disposed;
   private OutputStream out;
-  
+
   /**
    * Constructs a <code>StreamPrintService</code> object.
-   * 
+   *
    * @param out the <code>OutputStream</code> to use
    */
   protected StreamPrintService(OutputStream out)
@@ -78,16 +78,16 @@ public abstract class StreamPrintService implements PrintService
 
   /**
    * Returns the document format emitted by this print service.
-   * The returned string is a MIME type compatible with the 
+   * The returned string is a MIME type compatible with the
    * {@link DocFlavor} class.
-   * 
+   *
    * @return The document format of the output.
    */
   public abstract String getOutputFormat();
 
   /**
    * Returns the <code>OutputStream</code> of this object.
-   * 
+   *
    * @return The <code>OutputStream</code>
    */
   public OutputStream getOutputStream()
@@ -97,7 +97,7 @@ public abstract class StreamPrintService implements PrintService
 
   /**
    * Determines if this <code>StreamPrintService</code> object is disposed.
-   * 
+   *
    * @return <code>true</code> if disposed already,
    * otherwise <code>false</code>
    */
@@ -105,4 +105,4 @@ public abstract class StreamPrintService implements PrintService
   {
     return disposed;
   }
-}
-\ No newline at end of file
+}
diff --git a/javax/print/StreamPrintServiceFactory.java b/javax/print/StreamPrintServiceFactory.java
index 90496b36a..44f715996 100644
--- a/javax/print/StreamPrintServiceFactory.java
+++ b/javax/print/StreamPrintServiceFactory.java
@@ -1,4 +1,4 @@
-/* StreamPrintServiceFactory.java -- 
+/* StreamPrintServiceFactory.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,83 +46,83 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 /**
- * <code>StreamPrintServiceFactory</code> provides a static method to lookup 
+ * <code>StreamPrintServiceFactory</code> provides a static method to lookup
  * registered factories to construct <code>StreamPrintService</code> instances.
  * <p>
- * <code>StreamPrintService</code> are used to print into a provided output 
- * stream in the document format provided by the stream print service 
+ * <code>StreamPrintService</code> are used to print into a provided output
+ * stream in the document format provided by the stream print service
  * implementation.
  * </p><p>
- * Implementations are located and loaded automatically through the SPI JAR 
- * file specification. Therefore implementation classes must provide a default 
+ * Implementations are located and loaded automatically through the SPI JAR
+ * file specification. Therefore implementation classes must provide a default
  * constructor for instantiation.
  * </p>
- * 
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class StreamPrintServiceFactory
-{   
+{
   /**
    * Default public constructor.
-   * Used for automatic loading and instantiation through 
+   * Used for automatic loading and instantiation through
    * the SPI jar file specification.
    */
   public StreamPrintServiceFactory()
   {
     // nothing to do
   }
-  
+
   /**
-   * Searches for matching factories providing stream print services that  
-   * support the printing of documents with the given document flavor into 
+   * Searches for matching factories providing stream print services that
+   * support the printing of documents with the given document flavor into
    * the given output mime type.
-   * 
-   * @param flavor the document flavor needed, <code>null</code> doesn't 
+   *
+   * @param flavor the document flavor needed, <code>null</code> doesn't
    * constrain the lookup result.
-   * @param outputMimeType the mime type needed, <code>null</code> doesn't 
+   * @param outputMimeType the mime type needed, <code>null</code> doesn't
    * constrain the lookup result.
-   * 
+   *
    * @return The matching <code>StreamPrintServiceFactory</code> instances.
    */
   public static StreamPrintServiceFactory[] lookupStreamPrintServiceFactories(
     DocFlavor flavor, String outputMimeType)
   {
     HashSet set = new HashSet();
-    
-    Iterator it = 
+
+    Iterator it =
       ServiceFactory.lookupProviders(StreamPrintServiceFactory.class);
-    
+
     while (it.hasNext())
       {
         StreamPrintServiceFactory tmp = (StreamPrintServiceFactory) it.next();
         if (tmp.getOutputFormat().equals(outputMimeType)
             && Arrays.asList(tmp.getSupportedDocFlavors()).contains(flavor))
-          set.add(tmp);          
+          set.add(tmp);
       }
-    
+
     StreamPrintServiceFactory[] tmp = new StreamPrintServiceFactory[set.size()];
-    return (StreamPrintServiceFactory[]) set.toArray(tmp);  
-  } 
-  
+    return (StreamPrintServiceFactory[]) set.toArray(tmp);
+  }
+
   /**
    * Returns the output format supported by this factory.
-   * 
+   *
    * @return The mime type of the output format as string representation.
    */
   public abstract String getOutputFormat();
-  
+
   /**
    * Returns the document flavors this factory supports as flavors
    * for the input documents.
-   * 
+   *
    * @return The array of supported document flavors.
    */
   public abstract DocFlavor[] getSupportedDocFlavors();
-  
+
   /**
    * Constructs a <code>StreamPrintService</code> which directs its output
    * the given output stream.
-   * 
+   *
    * @param out the output stream for the produced document.
    * @return The constructed stream print service.
    */
diff --git a/javax/print/URIException.java b/javax/print/URIException.java
index 9b22bdf2f..cedcbaafc 100644
--- a/javax/print/URIException.java
+++ b/javax/print/URIException.java
@@ -41,15 +41,15 @@ package javax.print;
 import java.net.URI;
 
 /**
- * <code>URIException</code> specifies methods a specific subclass of 
- * {@link javax.print.PrintException} may implement to provide further 
+ * <code>URIException</code> specifies methods a specific subclass of
+ * {@link javax.print.PrintException} may implement to provide further
  * informations of printing errors if URI problems are involved.
  * <p>
- * There exists no <code>PrintException</code> class implementing this 
- * interface. Providing this extension in <code>PrintException</code> 
- * subclasses is left to the concrete print service implementation. 
+ * There exists no <code>PrintException</code> class implementing this
+ * interface. Providing this extension in <code>PrintException</code>
+ * subclasses is left to the concrete print service implementation.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface URIException
@@ -58,30 +58,30 @@ public interface URIException
    * Indicates that the provided <code>URI</code> is not accessible.
    */
   int URIInaccessible = 1;
-  
+
   /**
    * Indicates any other problem which is not defined by
    * the other reason constants.
    */
   int URIOtherProblem = -1;
-  
+
   /**
    * Indicates that the print service does not support a specific
    * uri scheme (for example the ftp scheme).
    */
   int URISchemeNotSupported = 2;
-  
+
   /**
    * Returns the reason for this exception as
    * predefined constants in this interface.
-   * 
+   *
    * @return The reason.
    */
   int getReason();
-  
+
   /**
    * Returns the unsupported <code>URI</code> which caused this exception.
-   * 
+   *
    * @return The unsupported <code>URI</code>.
    */
   URI getUnsupportedURI();
diff --git a/javax/print/attribute/Attribute.java b/javax/print/attribute/Attribute.java
index 8b98377ba..0fc7e4df6 100644
--- a/javax/print/attribute/Attribute.java
+++ b/javax/print/attribute/Attribute.java
@@ -1,4 +1,4 @@
-/* Attribute.java -- 
+/* Attribute.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ import java.io.Serializable;
 
 /**
  * Base interface of every printing attribute of the Java Print Service API.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface Attribute extends Serializable
@@ -49,17 +49,17 @@ public interface Attribute extends Serializable
   /**
    * Returns the category of the printing attribute which is the specific
    * attribute class implementing this interface.
-   * 
+   *
    * @return The concrete {@link Class} instance of the attribute class.
    */
   Class< ? extends Attribute> getCategory ();
 
   /**
    * Returns the descriptive name of the attribute category.
-   * 
+   *
    * Implementations of the <code>Attribute</code> interfaces providing equal
    * category values have to return equal name values.
-   * 
+   *
    * @return The name of the attribute category.
    */
   String getName ();
diff --git a/javax/print/attribute/AttributeSet.java b/javax/print/attribute/AttributeSet.java
index c8130c19f..d2111410f 100644
--- a/javax/print/attribute/AttributeSet.java
+++ b/javax/print/attribute/AttributeSet.java
@@ -1,4 +1,4 @@
-/* AttributeSet.java -- 
+/* AttributeSet.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,26 +57,26 @@ package javax.print.attribute;
  * </ul>
  * </p>
  * <p>
- * Attribute sets may be unmodifiable depending on the context of usage. If 
- * used as read-only attribute set modifying operations throw an 
+ * Attribute sets may be unmodifiable depending on the context of usage. If
+ * used as read-only attribute set modifying operations throw an
  * {@link javax.print.attribute.UnmodifiableSetException}.
  * </p>
  * <p>
  * The Java Print Service API provides implementation classes for the existing
  * attribute set interfaces but applications may use their own implementations.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute to the set. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute to the set.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
    * @throws NullPointerException if the attribute is <code>null</code>.
@@ -86,73 +86,73 @@ public interface AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
-  
+
   /**
    * Removes all attributes from this attribute set.
-   * 
+   *
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   void clear ();
-  
+
   /**
-   * Checks if this attributes set contains an attribute with the given 
+   * Checks if this attributes set contains an attribute with the given
    * category.
-   * 
+   *
    * @param category the category to test for.
    * @return <code>true</code> if an attribute of the category is contained
    * in the set, <code>false</code> otherwise.
    */
   boolean containsKey (Class<?> category);
-  
+
   /**
    * Checks if this attribute set contains the given attribute.
-   * 
+   *
    * @param attribute the attribute to test for.
    * @return <code>true</code> if the attribute is contained in the set,
    * <code>false</code> otherwise.
    */
   boolean containsValue (Attribute attribute);
-  
+
   /**
    * Tests this set for equality with the given object. <code>true</code> is
    * returned, if the given object is also of type <code>AttributeSet</code>
    * and the contained attributes are the same as in this set.
-   * 
+   *
    * @param obj the Object to test.
    * @return <code>true</code> if equal, false otherwise.
    */
   boolean equals (Object obj);
-  
+
   /**
    * Returns the attribute object contained in this set for the given attribute
-   * category. 
-   * 
-   * @param category the category of the attribute. A <code>Class</code> 
-   * instance of a class implementing the <code>Attribute</code> interface. 
-   * @return The attribute for this category or <code>null</code> if no 
-   * attribute is contained for the given category. 
+   * category.
+   *
+   * @param category the category of the attribute. A <code>Class</code>
+   * instance of a class implementing the <code>Attribute</code> interface.
+   * @return The attribute for this category or <code>null</code> if no
+   * attribute is contained for the given category.
    * @throws NullPointerException if category is null.
-   * @throws ClassCastException if category is not implementing 
+   * @throws ClassCastException if category is not implementing
    * <code>Attribute</code>.
    */
   Attribute get (Class<?> category);
-  
+
   /**
    * Returns the hashcode value. The hashcode value is the sum of all hashcodes
    * of the attributes contained in this set.
-   * 
+   *
    * @return The hashcode for this attribute set.
    */
   int hashCode ();
-  
+
   /**
    * Checks if the attribute set is empty.
    *
@@ -163,30 +163,30 @@ public interface AttributeSet
   /**
    * Removes the given attribute from the set. If the given attribute is <code>null</code>
    * nothing is done and <code>false</code> is returned.
-   * 
-   * @param attribute the attribute to remove.  
-   * @return <code>true</code> if removed, false in all other cases. 
+   *
+   * @param attribute the attribute to remove.
+   * @return <code>true</code> if removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   boolean remove (Attribute attribute);
-  
+
   /**
    * Removes the attribute entry of the given category from the set. If the given
    * category is <code>null</code> nothing is done and <code>false</code> is returned.
-   * 
+   *
    * @param category the category of the entry to be removed.
-   * @return <code>true</code> if an attribute is removed, false in all other cases. 
+   * @return <code>true</code> if an attribute is removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   boolean remove (Class<?> category);
-  
+
   /**
    * Returns the number of elements in this attribute set.
    *
    * @return The number of elements.
    */
   int size ();
-  
+
   /**
    * Returns the content of the attribute set as an array
    *
diff --git a/javax/print/attribute/AttributeSetUtilities.java b/javax/print/attribute/AttributeSetUtilities.java
index 95c11a6ed..4b7378af5 100644
--- a/javax/print/attribute/AttributeSetUtilities.java
+++ b/javax/print/attribute/AttributeSetUtilities.java
@@ -1,4 +1,4 @@
-/* AttributeSetUtilities.java -- 
+/* AttributeSetUtilities.java --
    Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ import java.io.Serializable;
  * if state changing methods are invoked.
  * </p>
  * <p>
- * Methods for getting a synchronized view of an attribute set are also 
+ * Methods for getting a synchronized view of an attribute set are also
  * available. This view provides synchronized (thread safe) access to the
  * underlying wrapped attribute set.
  * </P>
@@ -60,17 +60,17 @@ import java.io.Serializable;
  * <ul>
  * <li>the given object is an attribute of the given interface.</li>
  * <li>the category of given attribute is equals to a given category.</li>
- * <li>the given object is a <code>Class</code> that implements the given 
+ * <li>the given object is a <code>Class</code> that implements the given
  * interface name.</li>
  * </ul>
- * 
+ *
  */
 public final class AttributeSetUtilities
 {
   /**
    * This class isn't intended to be instantiated.
    */
-  private AttributeSetUtilities() 
+  private AttributeSetUtilities()
   {
     // only static methods
   }
@@ -97,7 +97,7 @@ public final class AttributeSetUtilities
     {
       throw new UnmodifiableSetException();
     }
-    
+
     public void clear()
     {
       throw new UnmodifiableSetException();
@@ -117,7 +117,7 @@ public final class AttributeSetUtilities
     {
       return attrset.equals(obj);
     }
-    
+
     public Attribute get(Class interfaceName)
     {
       return attrset.get(interfaceName);
@@ -127,7 +127,7 @@ public final class AttributeSetUtilities
     {
       return attrset.hashCode();
     }
-    
+
     public boolean isEmpty()
     {
       return attrset.isEmpty();
@@ -216,7 +216,7 @@ public final class AttributeSetUtilities
     {
       return attrset.addAll(attributes);
     }
-    
+
     public synchronized void clear()
     {
       attrset.clear();
@@ -236,7 +236,7 @@ public final class AttributeSetUtilities
     {
       return attrset.equals(obj);
     }
-    
+
     public synchronized Attribute get(Class interfaceName)
     {
       return attrset.get(interfaceName);
@@ -246,7 +246,7 @@ public final class AttributeSetUtilities
     {
       return attrset.hashCode();
     }
-    
+
     public synchronized boolean isEmpty()
     {
       return attrset.isEmpty();
@@ -334,7 +334,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedDocAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -345,7 +345,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintJobAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -356,7 +356,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintRequestAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -367,7 +367,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintServiceAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -378,7 +378,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiableAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -389,7 +389,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiableDocAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -400,7 +400,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiablePrintJobAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -411,7 +411,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiablePrintRequestAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -426,7 +426,7 @@ public final class AttributeSetUtilities
   /**
    * Verifies that the given object is a <code>Class</code> that
    * implements the given interface name and returns it casted.
-   * 
+   *
    * @param object the object to test.
    * @param interfaceName the <code>Class</code> to verify against.
    * @return object casted to <code>Class</code>
@@ -448,11 +448,11 @@ public final class AttributeSetUtilities
 
     throw new ClassCastException();
   }
-  
+
   /**
    * Verifies that the given object is an attribute of the given interface.
    * and returns it casted to the interface type.
-   * 
+   *
    * @param object the object to test.
    * @param interfaceName the <code>Class</code> to verify against.
    * @return the object casted to <code>Attribute</code>
@@ -475,7 +475,7 @@ public final class AttributeSetUtilities
   /**
    * Verifies that the category of attribute is equals to the given category
    * class.
-   * 
+   *
    * @param category the category to test.
    * @param attribute the attribute to verify.
    *
diff --git a/javax/print/attribute/DateTimeSyntax.java b/javax/print/attribute/DateTimeSyntax.java
index 8cff70219..7d587dbd8 100644
--- a/javax/print/attribute/DateTimeSyntax.java
+++ b/javax/print/attribute/DateTimeSyntax.java
@@ -1,4 +1,4 @@
-/* DateTimeSyntax.java -- 
+/* DateTimeSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,17 +41,17 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * <code>DateTimeSyntax</code> is the abstract base class of all attribute 
+ * <code>DateTimeSyntax</code> is the abstract base class of all attribute
  * classes having a date and a time as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class DateTimeSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -1400819079791208582L;
-  
+
   private Date value;
-  
+
   /**
    * Creates a <code>DateTimeSyntax</code> with a given value.
    *
@@ -79,10 +79,10 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable
 
   /**
    * Tests if the given object is equal to this one.
-   * 
+   *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -102,14 +102,14 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable
   {
     return value.hashCode();
   }
-  
+
   /**
    * Returns the string representation for this object.
    *
    * @return The string representation.
    */
-  public String toString() 
+  public String toString()
   {
-    return value.toString();    
+    return value.toString();
   }
 }
diff --git a/javax/print/attribute/DocAttribute.java b/javax/print/attribute/DocAttribute.java
index 9af3a7052..56114f73e 100644
--- a/javax/print/attribute/DocAttribute.java
+++ b/javax/print/attribute/DocAttribute.java
@@ -1,4 +1,4 @@
-/* DocAttribute.java -- 
+/* DocAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,20 +38,20 @@ exception statement from your version. */
 package javax.print.attribute;
 
 /**
- * Marker interface for all attribute classes describing attributes of 
- * a {@link javax.print.Doc} object. 
+ * Marker interface for all attribute classes describing attributes of
+ * a {@link javax.print.Doc} object.
  * <p>
- * Instances of implementing attribute classes may be collected in a 
- * {@link javax.print.attribute.DocAttributeSet}. 
+ * Instances of implementing attribute classes may be collected in a
+ * {@link javax.print.attribute.DocAttributeSet}.
  * </p><p>
  * Attributes attached to a {@link javax.print.Doc} instance specify how the
- * data should be printed. 
- * For example {@link javax.print.attribute.standard.Chromaticity} can be 
+ * data should be printed.
+ * For example {@link javax.print.attribute.standard.Chromaticity} can be
  * used to specify that a doc should be printed in color or monochrome.
  * </p>
- * 
+ *
  * @see javax.print.attribute.DocAttributeSet
- * 
+ *
  * @author Michael Koch  (konqueror@gmx.de)
  */
 public interface DocAttribute extends Attribute
diff --git a/javax/print/attribute/DocAttributeSet.java b/javax/print/attribute/DocAttributeSet.java
index d8d09eb48..35a2676b1 100644
--- a/javax/print/attribute/DocAttributeSet.java
+++ b/javax/print/attribute/DocAttributeSet.java
@@ -1,4 +1,4 @@
-/* DocAttributeSet.java -- 
+/* DocAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * <code>DocAttributeSet</code> specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.DocAttribute}.
  * <p>
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * <code>DocAttribute</code> instances are allowed in this set.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface DocAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * <code>DocAttribute</code>.
    * @throws NullPointerException if the attribute is <code>null</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface DocAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * <code>DocAttribute</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/javax/print/attribute/EnumSyntax.java b/javax/print/attribute/EnumSyntax.java
index 9a5e62d45..e848dfcc3 100644
--- a/javax/print/attribute/EnumSyntax.java
+++ b/javax/print/attribute/EnumSyntax.java
@@ -1,4 +1,4 @@
-/* EnumSyntax.java -- 
+/* EnumSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,16 +43,16 @@ import java.io.Serializable;
 
 /**
  * <code>EnumSyntax</code> is the abstract base class of all enumeration
- * classes in the Java Print Service API. 
+ * classes in the Java Print Service API.
  * <p>
- * Every enumeration class which extends from EnumSyntax provides several 
+ * Every enumeration class which extends from EnumSyntax provides several
  * enumeration objects as singletons of its class.
  * </p>
  * <p>
  * Notes for implementing subclasses:
  * <ul>
  *   <li>
- *     The values of all enumeration singelton instances have to be in a 
+ *     The values of all enumeration singelton instances have to be in a
  *     sequence which may start at any value. See: {@link #getOffset()}
  *   </li>
  *   <li>
@@ -61,50 +61,50 @@ import java.io.Serializable;
  *   </li>
  * </ul>
  * </p>
- * Example: 
- * <pre> 
+ * Example:
+ * <pre>
  * public class PrinterState extends EnumSyntax
  * {
  *   public static final PrinterState IDLE = new PrinterState(1);
  *   public static final PrinterState PROCESSING = new PrinterState(2);
  *   public static final PrinterState STOPPED = new PrinterState(3);
- * 
+ *
  *   protected PrinterState(int value)
  *   {
  *     super(value);
  *   }
- * 
+ *
  *   // Overridden because values start not at zero !
  *   protected int getOffset()
  *   {
  *     return 1;
  *   }
- * 
- *   private static final String[] stringTable = { "idle", "processing", 
+ *
+ *   private static final String[] stringTable = { "idle", "processing",
  *                                                 "stopped" };
- * 
+ *
  *   protected String[] getStringTable()
  *   {
  *     return stringTable;
  *   }
- * 
- *   private static final PrinterState[] enumValueTable = { IDLE, 
+ *
+ *   private static final PrinterState[] enumValueTable = { IDLE,
  *                                             PROCESSING, STOPPED};
- * 
+ *
  *   protected EnumSyntax[] getEnumValueTable()
  *   {
  *     return enumValueTable;
  *   }
  * }
  * </pre>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class EnumSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -2739521845085831642L;
-  
+
   private int value;
 
   /**
@@ -146,7 +146,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable
   }
 
   /**
-   * Returns the hashcode for this object. 
+   * Returns the hashcode for this object.
    * The hashcode is the value of this enumeration object.
    *
    * @return The hashcode.
@@ -173,7 +173,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable
         && index >= 0
         && index < table.length)
       return table[index];
-    
+
     return "" + value;
   }
 
@@ -193,12 +193,12 @@ public abstract class EnumSyntax implements Cloneable, Serializable
 
   /**
    * Needed for singelton semantics during deserialisation.
-   * 
+   *
    * Subclasses must not override this class. Subclasses have to override
-   * <code>getEnumValueTable()</code> and should override 
+   * <code>getEnumValueTable()</code> and should override
    * <code>getStringTable()</code> for correct serialization.
-   * 
-   * @return The Object at index <code>value - getOffset()</code> 
+   *
+   * @return The Object at index <code>value - getOffset()</code>
    *         in getEnumValueTable.
    * @throws ObjectStreamException if getEnumValueTable() returns null.
    */
@@ -227,10 +227,10 @@ public abstract class EnumSyntax implements Cloneable, Serializable
   }
 
   /**
-   * Returns the lowest used value by the enumerations of this class. 
-   * 
+   * Returns the lowest used value by the enumerations of this class.
+   *
    * The default implementation returns 0. This is enough if enumerations
-   * start with a zero value. Otherwise subclasses need to override this 
+   * start with a zero value. Otherwise subclasses need to override this
    * method for serialization and return the lowest value they use.
    * .
    * @return The lowest used value used.
diff --git a/javax/print/attribute/HashAttributeSet.java b/javax/print/attribute/HashAttributeSet.java
index 0f6b00730..39d00528d 100644
--- a/javax/print/attribute/HashAttributeSet.java
+++ b/javax/print/attribute/HashAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashAttributeSet.java -- 
+/* HashAttributeSet.java --
    Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ import java.util.Iterator;
 public class HashAttributeSet implements AttributeSet, Serializable
 {
   private static final long serialVersionUID = 5311560590283707917L;
-  
+
   private Class myInterface;
   private transient HashMap attributeMap = new HashMap();
 
@@ -95,7 +95,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Creates a <code>HashAttributeSet</code> object with attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    */
   public HashAttributeSet(AttributeSet attributes)
@@ -114,14 +114,14 @@ public class HashAttributeSet implements AttributeSet, Serializable
   {
     if (interfaceName == null)
       throw new NullPointerException("interfaceName may not be null");
-    
+
     myInterface = interfaceName;
   }
-  
+
   /**
    * Creates a <code>HashAttributeSet</code> object with the given
    * attribute in it.
-   * 
+   *
    * @param attribute the attribute to put into the set.
    * @param interfaceName the interface that all members must implement.
    *
@@ -132,10 +132,10 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(Attribute attribute, Class<?> interfaceName)
   {
     this(interfaceName);
-    
+
     if (attribute == null)
       throw new NullPointerException();
-    
+
     addInternal(attribute, interfaceName);
   }
 
@@ -154,7 +154,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(Attribute[] attributes, Class<?> interfaceName)
   {
     this(interfaceName);
-    
+
     if (attributes != null)
       {
         for (int index = 0; index < attributes.length; index++)
@@ -166,7 +166,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Creates a <code>HashAttributeSet</code> object with attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    * @param interfaceName the interface that all members must implement.
    *
@@ -176,18 +176,18 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(AttributeSet attributes, Class<?> interfaceName)
   {
     this(interfaceName);
-    
+
     if (attributes != null)
       addAllInternal(attributes, interfaceName);
   }
 
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute to the set. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute to the set.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
    * @throws NullPointerException if the attribute is <code>null</code>.
@@ -214,11 +214,11 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   public boolean addAll(AttributeSet attributes)
@@ -240,7 +240,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Removes all attributes from this attribute set.
-   * 
+   *
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public void clear()
@@ -249,9 +249,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   }
 
   /**
-   * Checks if this attributes set contains an attribute with the given 
+   * Checks if this attributes set contains an attribute with the given
    * category.
-   * 
+   *
    * @param category the category to test for.
    * @return <code>true</code> if an attribute of the category is contained
    * in the set, <code>false</code> otherwise.
@@ -263,7 +263,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Checks if this attribute set contains the given attribute.
-   * 
+   *
    * @param attribute the attribute to test for.
    * @return <code>true</code> if the attribute is contained in the set,
    * <code>false</code> otherwise.
@@ -277,7 +277,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Tests this set for equality with the given object. <code>true</code> is
    * returned, if the given object is also of type <code>AttributeSet</code>
    * and the contained attributes are the same as in this set.
-   * 
+   *
    * @param obj the Object to test.
    * @return <code>true</code> if equal, false otherwise.
    */
@@ -291,28 +291,28 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Returns the attribute object contained in this set for the given attribute
-   * category. 
-   * 
-   * @param category the category of the attribute. A <code>Class</code> 
-   * instance of a class implementing the <code>Attribute</code> interface. 
-   * @return The attribute for this category or <code>null</code> if no 
-   * attribute is contained for the given category. 
+   * category.
+   *
+   * @param category the category of the attribute. A <code>Class</code>
+   * instance of a class implementing the <code>Attribute</code> interface.
+   * @return The attribute for this category or <code>null</code> if no
+   * attribute is contained for the given category.
    * @throws NullPointerException if category is null.
-   * @throws ClassCastException if category is not implementing 
+   * @throws ClassCastException if category is not implementing
    * <code>Attribute</code>.
    */
   public Attribute get(Class<?> category)
   {
     if (category == null)
       throw new NullPointerException("category may not be null");
-    
+
     return (Attribute) attributeMap.get(category);
   }
-  
+
   /**
    * Returns the hashcode value. The hashcode value is the sum of all hashcodes
    * of the attributes contained in this set.
-   * 
+   *
    * @return The hashcode for this attribute set.
    */
   public int hashCode()
@@ -321,7 +321,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
     Iterator it = attributeMap.values().iterator();
     while (it.hasNext())
       hashcode = hashcode + it.next().hashCode();
-          
+
     return hashcode;
   }
 
@@ -338,9 +338,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   /**
    * Removes the given attribute from the set. If the given attribute is <code>null</code>
    * nothing is done and <code>false</code> is returned.
-   * 
-   * @param attribute the attribute to remove.  
-   * @return <code>true</code> if removed, false in all other cases. 
+   *
+   * @param attribute the attribute to remove.
+   * @return <code>true</code> if removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public boolean remove(Attribute attribute)
@@ -354,9 +354,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   /**
    * Removes the attribute entry of the given category from the set. If the given
    * category is <code>null</code> nothing is done and <code>false</code> is returned.
-   * 
+   *
    * @param category the category of the entry to be removed.
-   * @return <code>true</code> if an attribute is removed, false in all other cases. 
+   * @return <code>true</code> if an attribute is removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public boolean remove(Class<?> category)
@@ -393,10 +393,10 @@ public class HashAttributeSet implements AttributeSet, Serializable
         array[index] = (Attribute) it.next();
         index++;
       }
-    
+
     return array;
   }
-  
+
   // Implemented as specified in serialized form
   private void readObject(ObjectInputStream s)
     throws ClassNotFoundException, IOException
@@ -407,13 +407,13 @@ public class HashAttributeSet implements AttributeSet, Serializable
     for (int i=0; i < size; i++)
       add((Attribute) s.readObject());
   }
-         
+
   private void writeObject(ObjectOutputStream s) throws IOException
   {
     s.writeObject(myInterface);
     s.writeInt(size());
     Iterator it = attributeMap.values().iterator();
     while (it.hasNext())
-      s.writeObject(it.next());    
+      s.writeObject(it.next());
   }
 }
diff --git a/javax/print/attribute/HashDocAttributeSet.java b/javax/print/attribute/HashDocAttributeSet.java
index 2317db3bc..73c25863e 100644
--- a/javax/print/attribute/HashDocAttributeSet.java
+++ b/javax/print/attribute/HashDocAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashDocAttributeSet.java -- 
+/* HashDocAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashDocAttributeSet extends HashAttributeSet
   implements DocAttributeSet, Serializable
 {
   private static final long serialVersionUID = -1128534486061432528L;
-  
+
   /**
    * Creates an empty <code>HashDocAttributeSet</code> object.
    */
@@ -88,7 +88,7 @@ public class HashDocAttributeSet extends HashAttributeSet
    * Creates a <code>HashDocAttributeSet</code> object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of <code>DocAttribute</code>
diff --git a/javax/print/attribute/HashPrintJobAttributeSet.java b/javax/print/attribute/HashPrintJobAttributeSet.java
index ac4c902c3..ddeda3b47 100644
--- a/javax/print/attribute/HashPrintJobAttributeSet.java
+++ b/javax/print/attribute/HashPrintJobAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintJobAttributeSet.java -- 
+/* HashPrintJobAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   implements Serializable, PrintJobAttributeSet
 {
   private static final long serialVersionUID = -4204473656070350348L;
-  
+
   /**
    * Creates an empty <code>HashPrintJobAttributeSet</code> object.
    */
@@ -55,7 +55,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintJobAttributeSet</code> object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintJobAttributeSet</code> object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintJobAttributeSet</code> object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of <code>PrintJobAttribute</code>
diff --git a/javax/print/attribute/HashPrintRequestAttributeSet.java b/javax/print/attribute/HashPrintRequestAttributeSet.java
index e74c0e00f..61c2537df 100644
--- a/javax/print/attribute/HashPrintRequestAttributeSet.java
+++ b/javax/print/attribute/HashPrintRequestAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintRequestAttributeSet.java -- 
+/* HashPrintRequestAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   implements Serializable, PrintRequestAttributeSet
 {
   private static final long serialVersionUID = 2364756266107751933L;
-  
+
   /**
    * Creates an empty <code>HashPrintRequestAttributeSet</code> object.
    */
@@ -55,7 +55,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintRequestAttributeSet</code> object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintRequestAttributeSet</code> object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintRequestAttributeSet</code> object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of <code>PrintRequestAttribute</code>
diff --git a/javax/print/attribute/HashPrintServiceAttributeSet.java b/javax/print/attribute/HashPrintServiceAttributeSet.java
index 155514f2b..bc934def2 100644
--- a/javax/print/attribute/HashPrintServiceAttributeSet.java
+++ b/javax/print/attribute/HashPrintServiceAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintServiceAttributeSet.java -- 
+/* HashPrintServiceAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   implements Serializable, PrintServiceAttributeSet
 {
   private static final long serialVersionUID = 6642904616179203070L;
-  
+
   /**
    * Creates an empty <code>HashPrintServiceAttributeSet</code> object.
    */
@@ -55,7 +55,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintServiceAttributeSet</code> object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintServiceAttributeSet</code> object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a <code>HashPrintServiceAttributeSet</code> object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * <code>null</code> an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of <code>PrintServiceAttribute</code>
diff --git a/javax/print/attribute/IntegerSyntax.java b/javax/print/attribute/IntegerSyntax.java
index c2f9224a2..b53faa20a 100644
--- a/javax/print/attribute/IntegerSyntax.java
+++ b/javax/print/attribute/IntegerSyntax.java
@@ -1,4 +1,4 @@
-/* IntegerSyntax.java -- 
+/* IntegerSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,9 +40,9 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * <code>IntegerSyntax</code> is the abstract base class of all attribute 
+ * <code>IntegerSyntax</code> is the abstract base class of all attribute
  * classes having an integer as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class IntegerSyntax implements Cloneable, Serializable
@@ -94,7 +94,7 @@ public abstract class IntegerSyntax implements Cloneable, Serializable
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/PrintJobAttribute.java b/javax/print/attribute/PrintJobAttribute.java
index fd3663496..5954824d0 100644
--- a/javax/print/attribute/PrintJobAttribute.java
+++ b/javax/print/attribute/PrintJobAttribute.java
@@ -1,4 +1,4 @@
-/* PrintJobAttribute.java -- 
+/* PrintJobAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,19 +39,19 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes describing attributes or the
- * status of a ({@link javax.print.DocPrintJob} object. 
+ * status of a ({@link javax.print.DocPrintJob} object.
  * <p>
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintJobAttributeSet}.
  * </p><p>
  * A print service uses attributes of this type to inform about the status
- * of a print job. 
- * For example {@link javax.print.attribute.standard.DateTimeAtProcessing} 
- * is used to report at which date and time a job has started processing. 
+ * of a print job.
+ * For example {@link javax.print.attribute.standard.DateTimeAtProcessing}
+ * is used to report at which date and time a job has started processing.
  * </p>
- * 
+ *
  * @see javax.print.attribute.PrintJobAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttribute extends Attribute
diff --git a/javax/print/attribute/PrintJobAttributeSet.java b/javax/print/attribute/PrintJobAttributeSet.java
index 6283ae142..232f4b36a 100644
--- a/javax/print/attribute/PrintJobAttributeSet.java
+++ b/javax/print/attribute/PrintJobAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeSet.java -- 
+/* PrintJobAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * <code>PrintJobAttributeSet</code> specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintJobAttribute}.
  * <p>
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * <code>PrintJobAttribute</code> instances are allowed in this set.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * <code>PrintJobAttribute</code>.
    * @throws NullPointerException if the attribute is <code>null</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintJobAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * <code>PrintJobAttribute</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/javax/print/attribute/PrintRequestAttribute.java b/javax/print/attribute/PrintRequestAttribute.java
index 8a05b75d3..037838ca8 100644
--- a/javax/print/attribute/PrintRequestAttribute.java
+++ b/javax/print/attribute/PrintRequestAttribute.java
@@ -1,4 +1,4 @@
-/* PrintRequestAttribute.java -- 
+/* PrintRequestAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,14 +39,14 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes which specify a requested
- * attribute of {@link javax.print.DocPrintJob} object. 
+ * attribute of {@link javax.print.DocPrintJob} object.
  * <p>
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintRequestAttributeSet}.
  * </p>
- * 
+ *
  * @see javax.print.attribute.PrintRequestAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintRequestAttribute extends Attribute
diff --git a/javax/print/attribute/PrintRequestAttributeSet.java b/javax/print/attribute/PrintRequestAttributeSet.java
index 350d9a644..60098064f 100644
--- a/javax/print/attribute/PrintRequestAttributeSet.java
+++ b/javax/print/attribute/PrintRequestAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintRequestAttributeSet.java -- 
+/* PrintRequestAttributeSet.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * <code>PrintRequestAttributeSet</code> specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintRequestAttribute}.
  * <p>
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * <code>PrintRequestAttribute</code> instances are allowed in this set.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintRequestAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * <code>PrintRequestAttribute</code>.
    * @throws NullPointerException if the attribute is <code>null</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintRequestAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * <code>PrintRequestAttribute</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/javax/print/attribute/PrintServiceAttribute.java b/javax/print/attribute/PrintServiceAttribute.java
index 213f43796..82d26922a 100644
--- a/javax/print/attribute/PrintServiceAttribute.java
+++ b/javax/print/attribute/PrintServiceAttribute.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttribute.java -- 
+/* PrintServiceAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,19 +39,19 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes describing parameters
- * or the status of a {@link javax.print.PrintService}. 
+ * or the status of a {@link javax.print.PrintService}.
  * <p>
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintServiceAttributeSet}.
  * </p><p>
  * A print service uses attributes of this type to inform about the status
- * or the specific capabilities of itself. 
+ * or the specific capabilities of itself.
  * For example {@link javax.print.attribute.standard.PagesPerMinute} is used
- * to specify the average printable pages per minute of the print service. 
+ * to specify the average printable pages per minute of the print service.
  * </p>
- * 
+ *
  * @see javax.print.attribute.PrintServiceAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttribute extends Attribute
diff --git a/javax/print/attribute/PrintServiceAttributeSet.java b/javax/print/attribute/PrintServiceAttributeSet.java
index fa22ee0d9..418a59950 100644
--- a/javax/print/attribute/PrintServiceAttributeSet.java
+++ b/javax/print/attribute/PrintServiceAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeSet.java -- 
+/* PrintServiceAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * <code>PrintServiceAttributeSet</code> specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintServiceAttribute}.
  * <p>
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * <code>PrintServiceAttribute</code> instances are allowed in this set.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * <code>PrintServiceAttribute</code>.
    * @throws NullPointerException if the attribute is <code>null</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintServiceAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return <code>true</code> if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * <code>PrintServiceAttribute</code>.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/javax/print/attribute/ResolutionSyntax.java b/javax/print/attribute/ResolutionSyntax.java
index aca4c0188..54468d087 100644
--- a/javax/print/attribute/ResolutionSyntax.java
+++ b/javax/print/attribute/ResolutionSyntax.java
@@ -1,4 +1,4 @@
-/* ResolutionSyntax.java -- 
+/* ResolutionSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,11 +40,11 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * <code>ResolutionSyntax</code> is the abstract base class of all attribute 
+ * <code>ResolutionSyntax</code> is the abstract base class of all attribute
  * classes which provide a resolution as value (e.g. printer resolution).
  * <p>
  * A <code>ResolutionSyntax</code> instance consists of two integer values
- * describing the resolution in feed and cross feed direction. The units of 
+ * describing the resolution in feed and cross feed direction. The units of
  * the given values is determined by two defined constants:
  * <ul>
  * <li>DPCM - dots per centimeter</li>
@@ -56,25 +56,25 @@ import java.io.Serializable;
  * one of the two constants defining the actual units of the given values.
  * </p>
  * <p>
- * There are different methods provided to return the resolution values in 
+ * There are different methods provided to return the resolution values in
  * either of the both units and to compare if a resolution is less than or
  * equal to a given other resolution attribute.
  * </p>
  * <p>
  * <b>Internal storage:</b><br>
- * The resolutions are stored internally as dots per 100 inches (dphi). The 
+ * The resolutions are stored internally as dots per 100 inches (dphi). The
  * values of the provided constants for dots per inch (value 100) and dots
  * per centimeter (value 254) are used as conversion factors to the internal
  * storage units. To get the internal dphi values a multiplication of a given
- * resolution value with its units constant value is needed. Retrieving the 
- * resolution for specific units is done by dividing the internal stored 
- * value through the units constant value. Clients are therefore able to 
+ * resolution value with its units constant value is needed. Retrieving the
+ * resolution for specific units is done by dividing the internal stored
+ * value through the units constant value. Clients are therefore able to
  * provide their own resolution units by supplying other conversion factors.
  * Subclasses of <code>ResolutionSyntax</code> have access to the internal
- * resolution values through the protected methods 
+ * resolution values through the protected methods
  * {@link #getCrossFeedResolutionDphi()} and {@link #getFeedResolutionDphi()}.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class ResolutionSyntax
@@ -94,7 +94,7 @@ public abstract class ResolutionSyntax
 
   private int crossFeedResolution;
   private int feedResolution;
-  
+
   /**
    * Creates a <code>ResolutionSyntax</code> object with the given arguments.
    *
@@ -121,7 +121,7 @@ public abstract class ResolutionSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -130,7 +130,7 @@ public abstract class ResolutionSyntax
       return false;
 
     ResolutionSyntax tmp = (ResolutionSyntax) obj;
-    
+
     return (crossFeedResolution == tmp.getCrossFeedResolutionDphi()
             && feedResolution == tmp.getFeedResolutionDphi());
   }
@@ -186,7 +186,7 @@ public abstract class ResolutionSyntax
   {
     return feedResolution;
   }
-  
+
   /**
    * Returns the resolution as two field array. Index 0 is the cross feed
    * resolution, index 1 the feed resolution.
@@ -214,7 +214,7 @@ public abstract class ResolutionSyntax
   }
 
   /**
-   * Checks if the given resolution attribute is a lower or equal 
+   * Checks if the given resolution attribute is a lower or equal
    * to this resolution object.
    *
    * @param other the resolution to check against
@@ -252,7 +252,7 @@ public abstract class ResolutionSyntax
    * for the cross feed and F for the feed direction resolution.
    * U denotes the units name if one is supplied.
    * </p>
-   * 
+   *
    * @param units the units to use
    * @param unitsName the name of the units. If <code>null</code>
    * it is ommitted from the string representation.
@@ -263,7 +263,7 @@ public abstract class ResolutionSyntax
   {
     if (unitsName == null)
       return getCrossFeedResolution(units) + "x" + getFeedResolution(units);
-    
+
     return ("" + getCrossFeedResolution(units)
             + "x" + getFeedResolution(units)
             + " " + unitsName);
diff --git a/javax/print/attribute/SetOfIntegerSyntax.java b/javax/print/attribute/SetOfIntegerSyntax.java
index 4c0dd2f19..b1e0af1a7 100644
--- a/javax/print/attribute/SetOfIntegerSyntax.java
+++ b/javax/print/attribute/SetOfIntegerSyntax.java
@@ -1,4 +1,4 @@
-/* SetOfIntegerSyntax.java -- 
+/* SetOfIntegerSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import java.util.Arrays;
 import java.util.Comparator;
 
 /**
- * <code>SetOfIntegerSyntax</code> is the abstract base class of all attribute 
+ * <code>SetOfIntegerSyntax</code> is the abstract base class of all attribute
  * classes which provide a set of non-negative integers as value (e.g. the
  * page ranges to print) represented as single values or ranges of values.
  * <p>
  * A <code>SetOfIntegerSyntax</code> instance consists of an integer array of
  * ranges. Ranges may have the same lower and upper bound representing a single
- * integer value. Ranges with a lower bound greater than the upper bound are 
- * null ranges and discarded. Ranges may overlap in their values. In no case 
+ * integer value. Ranges with a lower bound greater than the upper bound are
+ * null ranges and discarded. Ranges may overlap in their values. In no case
  * negative integers are allowed.
  * </p>
  * <p>
@@ -65,21 +65,21 @@ import java.util.Comparator;
  * Constructor for an instance with one range of integer values.
  * </li><br>
  * <li><code>SetOfIntegerSyntax(int[][] members)</code><br>
- * Flexible constructor for an instance with several single integer values 
- * and/or several ranges of integer values. The allowed array form is an 
- * array of integer arrays of length one or two. Examples are: 
+ * Flexible constructor for an instance with several single integer values
+ * and/or several ranges of integer values. The allowed array form is an
+ * array of integer arrays of length one or two. Examples are:
  * <code>int[0][]</code> for empty set of integers, <code>int[][] {{1}}</code>
  * , <code>int[][] {{1,5}}</code>, <code>int[][] {{1,5},{7,9}}</code>,
  * <code>int[][] {{3,7},{19}}</code>.
  * </li><br>
  * <li><code>SetOfIntegerSyntax(String s)</code><br>
- * Flexible constructor for an instance with several single integer values 
+ * Flexible constructor for an instance with several single integer values
  * and/or several ranges of integer values. The allowed String instance have
- * to be a String with comma separated ranges of integer values or single 
+ * to be a String with comma separated ranges of integer values or single
  * values. Ranges are represented by two integer with a hypen (-) or colon (:)
  * between the lower and upper bound value. Whitespace characters are ignored.
- * Examples are: <code>""</code> for an empty set of integers, 
- * <code>"1"</code>, <code>"1-5"</code>, <code>"1-5,7-9"</code>, 
+ * Examples are: <code>""</code> for an empty set of integers,
+ * <code>"1"</code>, <code>"1-5"</code>, <code>"1-5,7-9"</code>,
  * <code>"3-7,19"</code> and <code>"1:2,4"</code>.
  * </li>
  * </ul>
@@ -88,9 +88,9 @@ import java.util.Comparator;
  * <b>Internal storage:</b><br>
  * The set of integers are stored internally in a normalized array form.
  * In the normalized array form the set of integer ranges are represented
- * in as few ranges as possible and overlapping ranges are merged. The ranges 
- * are always represented as an integer array of length two with ranges 
- * stored in {lower bound, upper bound} form. The ranges are stored in 
+ * in as few ranges as possible and overlapping ranges are merged. The ranges
+ * are always represented as an integer array of length two with ranges
+ * stored in {lower bound, upper bound} form. The ranges are stored in
  * ascending order, without any null ranges.
  * </p>
  * @author Michael Koch (konqueror@gmx.de)
@@ -132,13 +132,13 @@ public abstract class SetOfIntegerSyntax
           }
         values[outIndex++] = values[save];
       }
-    
+
     int[][] result = new int[outIndex][];
     System.arraycopy(values, 0, result, 0, outIndex);
-    
+
     return result;
   }
-  
+
   /**
    * Creates a <code>SetOfIntegerSyntax</code> object.
    *
@@ -203,17 +203,17 @@ public abstract class SetOfIntegerSyntax
               }
           }
       }
-    
+
     this.members = normalize(newMembers, outIndex);
   }
-  
+
   private boolean skipWhitespace(StringCharacterIterator i)
   {
     while (Character.isWhitespace(i.current()))
       i.next();
     return i.current() == CharacterIterator.DONE;
   }
-  
+
   private boolean skipNumber(StringCharacterIterator i)
   {
     boolean readAny = false;
@@ -238,24 +238,24 @@ public abstract class SetOfIntegerSyntax
     if (s == null)
       this.members = normalize(new int[0][], 0);
     else
-      {      
+      {
         ArrayList vals = new ArrayList();
-        
+
         StringCharacterIterator it = new StringCharacterIterator(s);
-        
+
         while (true)
           {
             // Skip whitespace.
             if (skipWhitespace(it))
               break;
-            
+
             // Parse integer.
             int index = it.getIndex();
             if (! skipNumber(it))
               throw new IllegalArgumentException();
             int[] item = new int[2];
             item[0] = Integer.parseInt(s.substring(index, it.getIndex()));
-            
+
             if (! skipWhitespace(it))
               {
                 char c = it.current();
@@ -274,17 +274,17 @@ public abstract class SetOfIntegerSyntax
               }
             else
               item[1] = item[0];
-            
-            if (item[0] <= item[1]) 
+
+            if (item[0] <= item[1])
               vals.add(item);
-            
+
             if (skipWhitespace(it))
               break;
             if (it.current() != ',')
               throw new IllegalArgumentException();
             it.next();
           }
-        
+
         members = normalize((int[][]) vals.toArray(new int[0][]), vals.size());
       }
   }
@@ -393,7 +393,7 @@ public abstract class SetOfIntegerSyntax
    *
    * @param x an integer value
    *
-   * @return The next smallest integer value, or <code>-1</code> if there 
+   * @return The next smallest integer value, or <code>-1</code> if there
    * is no greater integer in the set.
    */
   public int next(int x)
diff --git a/javax/print/attribute/Size2DSyntax.java b/javax/print/attribute/Size2DSyntax.java
index 0b5c10070..b9e0e25db 100644
--- a/javax/print/attribute/Size2DSyntax.java
+++ b/javax/print/attribute/Size2DSyntax.java
@@ -1,4 +1,4 @@
-/* Size2DSyntax.java -- 
+/* Size2DSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,12 +40,12 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * <code>Size2DSyntax</code> is the abstract base class of all attribute 
+ * <code>Size2DSyntax</code> is the abstract base class of all attribute
  * classes which provide a two dimensional size as value (e.g. the size of
  * a media like Letter or A4).
  * <p>
  * A <code>Size2DSyntax</code> instance consists of two integer values
- * describing the size in the x and y dimension. The units of 
+ * describing the size in the x and y dimension. The units of
  * the given values is determined by two defined constants:
  * <ul>
  * <li>INCH - defines an inch</li>
@@ -54,7 +54,7 @@ import java.io.Serializable;
  * </p>
  * <p>
  * A size 2D attribute is constructed by two values for the size of the x and
- * y dimension and the actual units of the given values as defined by the 
+ * y dimension and the actual units of the given values as defined by the
  * constants.
  * </p>
  * <p>
@@ -64,16 +64,16 @@ import java.io.Serializable;
  * </p>
  * <p>
  * <b>Internal storage:</b><br>
- * The size of the x,y dimensions are stored internally in micrometers. The 
+ * The size of the x,y dimensions are stored internally in micrometers. The
  * values of the provided constants for inch (value 25400) and millimeters
  * (value 1000) are used as conversion factors to the internal storage units.
  * To get the internal micrometers values a multiplication of a given
  * size value with its units constant value is done. Retrieving the size value
- * for specific units is done by dividing the internal stored value by the 
- * units constant value. Clients are therefore able to provide their own 
+ * for specific units is done by dividing the internal stored value by the
+ * units constant value. Clients are therefore able to provide their own
  * size units by supplying other conversion factors.
  * Subclasses of <code>Size2DSyntax</code> have access to the internal
- * size values through the protected methods 
+ * size values through the protected methods
  * {@link #getXMicrometers()} and {@link #getYMicrometers()}.
  * </p>
  *
@@ -221,7 +221,7 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
 
     return ((float) y) / ((float) units);
   }
-  
+
   /**
    * Returns the size in y direction in mircometers.
    * To be used by sublcasses that need access to the internal storage value.
@@ -247,10 +247,10 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
    * Returns the string representation for this object.
    * <p>
    * The returned string is in the form "XxY um" with X standing
-   * for size in x and Y for the size in y direction. The used 
+   * for size in x and Y for the size in y direction. The used
    * micrometers units is indicated by the appended "um" notation.
    * </p>
-   * 
+   *
    * @return The string representation in micrometers.
    */
   public String toString()
@@ -262,11 +262,11 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
    * Returns the string representation for this object.
    * <p>
    * The returned string is in the form "XxY U" with X standing
-   * for size in x and Y for the size in y direction. U denotes 
+   * for size in x and Y for the size in y direction. U denotes
    * the units name if one is supplied. The values are given as
    * floating point values.
    * </p>
-   * 
+   *
    * @param units the units to use
    * @param unitsName the name of the units. If <code>null</code>
    * it is ommitted from the string representation.
@@ -277,7 +277,7 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
   {
     if (unitsName == null)
       return getX(units) + "x" + getY(units);
-    
+
     return getX(units) + "x" + getY(units) + " " + unitsName;
   }
 }
diff --git a/javax/print/attribute/SupportedValuesAttribute.java b/javax/print/attribute/SupportedValuesAttribute.java
index a001e7e91..5380b4609 100644
--- a/javax/print/attribute/SupportedValuesAttribute.java
+++ b/javax/print/attribute/SupportedValuesAttribute.java
@@ -1,4 +1,4 @@
-/* SupportedValuesAttribute.java -- 
+/* SupportedValuesAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,7 @@ exception statement from your version. */
 package javax.print.attribute;
 
 /**
- * Marker interface for all attribute classes specifying the 
+ * Marker interface for all attribute classes specifying the
  * supported/allowed values for another printing attribute class.
  * <p>
  * A {@link javax.print.PrintService} instance for example provides
@@ -46,11 +46,11 @@ package javax.print.attribute;
  * that a specific attribute type is supported and if the supported values.
  * </p><p>
  * E.g. a {@link javax.print.attribute.standard.JobPrioritySupported}
- * instance indicates that the attribute class 
+ * instance indicates that the attribute class
  * {@link javax.print.attribute.standard.JobPriority} is supported and
  * provides the number of the possible priority levels.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface SupportedValuesAttribute extends Attribute
diff --git a/javax/print/attribute/TextSyntax.java b/javax/print/attribute/TextSyntax.java
index 2daab6ec3..43e3a9d30 100644
--- a/javax/print/attribute/TextSyntax.java
+++ b/javax/print/attribute/TextSyntax.java
@@ -1,4 +1,4 @@
-/* TextSyntax.java -- 
+/* TextSyntax.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ import java.io.Serializable;
 import java.util.Locale;
 
 /**
- * <code>TextSyntax</code> is the abstract base class of all attribute 
+ * <code>TextSyntax</code> is the abstract base class of all attribute
  * classes which provide a string as value (e.g. the location of the printer).
  * <p>
  * A <code>TextSyntax</code> instance consists of a string value and a
@@ -53,7 +53,7 @@ import java.util.Locale;
 public abstract class TextSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -8130648736378144102L;
-  
+
   private String value;
   private Locale locale;
 
@@ -71,7 +71,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
   {
     if (value == null)
       throw new NullPointerException("value may not be null");
-    
+
     this.value = value;
     this.locale = (locale == null ? Locale.getDefault() : locale);
   }
@@ -119,7 +119,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
       return false;
 
     TextSyntax tmp = (TextSyntax) obj;
-    
+
     return (value.equals(tmp.getValue())
             && locale.equals(tmp.getLocale()));
   }
@@ -127,7 +127,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
   /**
    * Returns a string representing the object. The returned
    * string is the underlying text value of this object.
-   * 
+   *
    * @return The string representation.
    */
   public String toString()
diff --git a/javax/print/attribute/URISyntax.java b/javax/print/attribute/URISyntax.java
index 07deb4b57..a0903a46c 100644
--- a/javax/print/attribute/URISyntax.java
+++ b/javax/print/attribute/URISyntax.java
@@ -1,4 +1,4 @@
-/* URISyntax.java -- 
+/* URISyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,9 +41,9 @@ import java.io.Serializable;
 import java.net.URI;
 
 /**
- * <code>URISyntax</code> is the abstract base class of all attribute 
+ * <code>URISyntax</code> is the abstract base class of all attribute
  * classes having an Uniform Resource Identifier URI as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class URISyntax
@@ -73,7 +73,7 @@ public abstract class URISyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/UnmodifiableSetException.java b/javax/print/attribute/UnmodifiableSetException.java
index ed1687c4c..6712266b9 100644
--- a/javax/print/attribute/UnmodifiableSetException.java
+++ b/javax/print/attribute/UnmodifiableSetException.java
@@ -1,4 +1,4 @@
-/* UnmodifiableSetException.java -- 
+/* UnmodifiableSetException.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ package javax.print.attribute;
 /**
  * Exception which is thrown if an operation on an unmodifiable set
  * is invoked.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  *
  * @since 1.4
diff --git a/javax/print/attribute/standard/Chromaticity.java b/javax/print/attribute/standard/Chromaticity.java
index 3dec79893..619341f31 100644
--- a/javax/print/attribute/standard/Chromaticity.java
+++ b/javax/print/attribute/standard/Chromaticity.java
@@ -49,7 +49,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * should be printed in monochrome or color.
  * <p>
  * The attribute interacts with the document to be printed. If the document
- * to be printed is a monochrome document it will be printed monochrome 
+ * to be printed is a monochrome document it will be printed monochrome
  * regardless of the value of this attribute category. However if it is a
  * color document supplying the attribute value <code>MONOCHROME</code>
  * will prepare the document to be printed in monochrome instead of color.
@@ -63,20 +63,20 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * <b>IPP Compatibility:</b> Chromaticity is not an IPP 1.1 attribute.
  * </p>
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class Chromaticity extends EnumSyntax
   implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
 {
   private static final long serialVersionUID = 4660543931355214012L;
-  
+
   /** Specifies monochrome printing. */
   public static final Chromaticity MONOCHROME = new Chromaticity(0);
-  
+
   /** Specifies color printing. */
   public static final Chromaticity COLOR = new Chromaticity(1);
-  
+
   private static final String[] stringTable = { "monochrome", "color" };
   private static final Chromaticity[] enumValueTable = { MONOCHROME, COLOR };
 
@@ -109,7 +109,7 @@ public final class Chromaticity extends EnumSyntax
   {
     return "chromaticity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -130,5 +130,5 @@ public final class Chromaticity extends EnumSyntax
   {
     return enumValueTable;
   }
-  
+
 }
diff --git a/javax/print/attribute/standard/ColorSupported.java b/javax/print/attribute/standard/ColorSupported.java
index c5e251a50..2fa8fd728 100644
--- a/javax/print/attribute/standard/ColorSupported.java
+++ b/javax/print/attribute/standard/ColorSupported.java
@@ -43,7 +43,7 @@ import javax.print.attribute.PrintServiceAttribute;
 
 
 /**
- * The <code>ColorSupported</code> printing attribute specifies if a 
+ * The <code>ColorSupported</code> printing attribute specifies if a
  * printing device is capable of color printing.
  * <p>
  * This attributes just tells if a printer device supports color printing
@@ -56,7 +56,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * in the Java Print Service API. The IPP boolean value true corresponds
  * to <code>SUPPORTED</code> and "false" to <code>NOT_SUPPORTED</code>.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class ColorSupported extends EnumSyntax
@@ -66,17 +66,17 @@ public final class ColorSupported extends EnumSyntax
 
   /** The printer does not support printing in color. */
   public static final ColorSupported NOT_SUPPORTED = new ColorSupported(0);
-  
+
   /** The printer supports printing in color. */
   public static final ColorSupported SUPPORTED = new ColorSupported(1);
 
   private static final String[] stringTable = { "not-supported", "supported" };
   private static final ColorSupported[] enumValueTable = { NOT_SUPPORTED,
                                                           SUPPORTED };
-  
+
   /**
    * Constructs a <code>ColorSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected ColorSupported(int value)
@@ -103,7 +103,7 @@ public final class ColorSupported extends EnumSyntax
   {
     return "color-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/Compression.java b/javax/print/attribute/standard/Compression.java
index f2f4f1cc1..412ed5af9 100644
--- a/javax/print/attribute/standard/Compression.java
+++ b/javax/print/attribute/standard/Compression.java
@@ -52,7 +52,7 @@ import javax.print.attribute.EnumSyntax;
  * <p>
  * <b>IPP Compatibility:</b> Compression is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class Compression extends EnumSyntax
@@ -62,24 +62,24 @@ public class Compression extends EnumSyntax
 
   /** The print data is not compressed. */
   public static final Compression NONE = new Compression(0);
-  
+
   /** The print data is ZIP compressed. */
   public static final Compression DEFLATE = new Compression(1);
-  
+
   /** The print data is GNU Zip compressed. */
   public static final Compression GZIP = new Compression(2);
-  
+
   /** The print data is UNIX compressed. */
   public static final Compression COMPRESS = new Compression(3);
-  
-  private static final String[] stringTable = { "none", "deflate", 
+
+  private static final String[] stringTable = { "none", "deflate",
                                                 "gzip", "compress" };
-  private static final Compression[] enumValueTable = { NONE, DEFLATE, 
+  private static final Compression[] enumValueTable = { NONE, DEFLATE,
                                                         GZIP, COMPRESS };
 
   /**
    * Constructs a <code>Compression</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected Compression(int value)
@@ -106,7 +106,7 @@ public class Compression extends EnumSyntax
   {
     return "compression";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/Copies.java b/javax/print/attribute/standard/Copies.java
index ea9a0990a..c4bc2496a 100644
--- a/javax/print/attribute/standard/Copies.java
+++ b/javax/print/attribute/standard/Copies.java
@@ -1,4 +1,4 @@
-/* Copies.java -- 
+/* Copies.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,22 +46,22 @@ import javax.print.attribute.PrintRequestAttribute;
  * The <code>Copies</code> printing attribute specifies the number
  * of copies to be printed.
  * <p>
- * <b>Note:</b> The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * <b>Note:</b> The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> Copies is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.MultipleDocumentHandling
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class Copies extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -6426631521680023833L;
-  
+
   /**
    * Creates a <code>Copies</code> object.
    *
@@ -76,13 +76,13 @@ public final class Copies extends IntegerSyntax
     if (value < 1)
       throw new IllegalArgumentException("value may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/CopiesSupported.java b/javax/print/attribute/standard/CopiesSupported.java
index 1f62f48a8..d8af8eb57 100644
--- a/javax/print/attribute/standard/CopiesSupported.java
+++ b/javax/print/attribute/standard/CopiesSupported.java
@@ -44,12 +44,12 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 /**
  * The <code>CopiesSupported</code> attribute specifies the supported
- * value or range of values for the 
- * {@link javax.print.attribute.standard.Copies} attribute. 
+ * value or range of values for the
+ * {@link javax.print.attribute.standard.Copies} attribute.
  * <p>
  * <b>IPP Compatibility:</b> CopiesSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -60,25 +60,25 @@ public final class CopiesSupported extends SetOfIntegerSyntax
 
   /**
    * Constructs a <code>CopiesSupported</code> object with
-   * the given value. This means that only this value is 
+   * the given value. This means that only this value is
    * supported for copies.
-   * 
+   *
    * @param member the member value
    * @exception IllegalArgumentException if member is &lt; 1
    */
   public CopiesSupported(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
 
   /**
    * Constructs a <code>CopiesSupported</code> object with
-   * the given range of values. This means that values for 
+   * the given range of values. This means that values for
    * copies are supported inside the specified range.
-   * 
+   *
    * @param lowerBound the lower bound value
    * @param upperBound the upper bound value
    *
@@ -87,17 +87,17 @@ public final class CopiesSupported extends SetOfIntegerSyntax
   public CopiesSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/DateTimeAtCompleted.java b/javax/print/attribute/standard/DateTimeAtCompleted.java
index 324bab73b..285fc0d3f 100644
--- a/javax/print/attribute/standard/DateTimeAtCompleted.java
+++ b/javax/print/attribute/standard/DateTimeAtCompleted.java
@@ -1,4 +1,4 @@
-/* DateTimeAtCompleted.java -- 
+/* DateTimeAtCompleted.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The <code>DateTimeAtCompleted</code> attribute specifies the date and 
+ * The <code>DateTimeAtCompleted</code> attribute specifies the date and
  * the time at which a print job completed (or was canceled or aborted).
  * <p>
  * <b>IPP Compatibility:</b> DateTimeAtCompleted is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.DateTimeAtCreation
  * @see javax.print.attribute.standard.DateTimeAtProcessing
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtCompleted extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/DateTimeAtCreation.java b/javax/print/attribute/standard/DateTimeAtCreation.java
index 5e975b64a..60b885ad1 100644
--- a/javax/print/attribute/standard/DateTimeAtCreation.java
+++ b/javax/print/attribute/standard/DateTimeAtCreation.java
@@ -1,4 +1,4 @@
-/* DateTimeAtCreation.java -- 
+/* DateTimeAtCreation.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The <code>DateTimeAtCreation</code> attribute specifies the 
+ * The <code>DateTimeAtCreation</code> attribute specifies the
  * date and the time at which a print job was created.
  * <p>
  * <b>IPP Compatibility:</b> DateTimeAtCreation is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.DateTimeAtCompleted
  * @see javax.print.attribute.standard.DateTimeAtProcessing
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtCreation extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtCreation extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/DateTimeAtProcessing.java b/javax/print/attribute/standard/DateTimeAtProcessing.java
index b407d2b2a..733c56589 100644
--- a/javax/print/attribute/standard/DateTimeAtProcessing.java
+++ b/javax/print/attribute/standard/DateTimeAtProcessing.java
@@ -1,4 +1,4 @@
-/* DateTimeAtProcessing.java -- 
+/* DateTimeAtProcessing.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import javax.print.attribute.PrintJobAttribute;
  * </p>
  * @see javax.print.attribute.standard.DateTimeAtCompleted
  * @see javax.print.attribute.standard.DateTimeAtCreation
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtProcessing extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/Destination.java b/javax/print/attribute/standard/Destination.java
index a82aa4b36..d37340a9e 100644
--- a/javax/print/attribute/standard/Destination.java
+++ b/javax/print/attribute/standard/Destination.java
@@ -49,22 +49,22 @@ import javax.print.attribute.URISyntax;
  * The <code>Destination</code> attribute provides a URI for an alternate
  * destination of the printing output.
  * <p>
- * As not an IPP attribute many print services will not support this 
+ * As not an IPP attribute many print services will not support this
  * attribute and only provide the printer device as a destination.
  * An alternate output destination would be a file on the local harddisk
  * given as a file scheme URI.
  * </p>
- * <p> 
- * If a print service does not support the destination attributes URI it 
+ * <p>
+ * If a print service does not support the destination attributes URI it
  * will throw a PrintException. This exception may further implement the
- * interface {@link javax.print.URIException}. 
+ * interface {@link javax.print.URIException}.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> Destination is not an IPP 1.1 attribute.
  * </p>
  * @see javax.print.PrintException
  * @see javax.print.URIException
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,7 +75,7 @@ public final class Destination extends URISyntax
 
   /**
    * Constructs a <code>Destination</code> object.
-   * 
+   *
    * @param uri the URI of the output destination.
    * @throws NullPointerException if the given uri is null.
    */
@@ -83,13 +83,13 @@ public final class Destination extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/DocumentName.java b/javax/print/attribute/standard/DocumentName.java
index 6a377d5be..f6f792725 100644
--- a/javax/print/attribute/standard/DocumentName.java
+++ b/javax/print/attribute/standard/DocumentName.java
@@ -1,4 +1,4 @@
-/* DocumentName.java -- 
+/* DocumentName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,15 +48,15 @@ import javax.print.attribute.TextSyntax;
  * The <code>DocumentName</code> printing attribute specifies a document name.
  * <p>
  * The document name may be different than the name of the job. It must not be
- * unique across multiple documents in the same print job. Normally, an 
- * application provides the document name for the user by using e.g. the file 
+ * unique across multiple documents in the same print job. Normally, an
+ * application provides the document name for the user by using e.g. the file
  * name or a name generated automatically by the application.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> DocumentName is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.JobName
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DocumentName extends TextSyntax
@@ -83,7 +83,7 @@ public final class DocumentName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/Fidelity.java b/javax/print/attribute/standard/Fidelity.java
index 5e25f5b88..39d26a127 100644
--- a/javax/print/attribute/standard/Fidelity.java
+++ b/javax/print/attribute/standard/Fidelity.java
@@ -53,20 +53,20 @@ import javax.print.attribute.PrintRequestAttribute;
  * through the client by providing this attribute to indicate the wanted
  * conflict handling mechanism:
  * <ul>
- * <li>{@link #FIDELITY_TRUE}: Reject the job since the job can not be 
+ * <li>{@link #FIDELITY_TRUE}: Reject the job since the job can not be
  * processed exactly as specified by the attributes of the client.</li>
- * <li>{@link #FIDELITY_FALSE}: The Printer may make any changes necessary 
+ * <li>{@link #FIDELITY_FALSE}: The Printer may make any changes necessary
  * to proceed with processing the Job as good as possible.</li>
  * </ul>
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> Fidelity is an IPP 1.1 attribute. The IPP name
- * is "ipp-attribute-fidelity". The IPP specification treats Fidelity as a 
+ * is "ipp-attribute-fidelity". The IPP specification treats Fidelity as a
  * boolean type which is not available in the Java Print Service API. The IPP
- * boolean value "true" corresponds to <code>FIDELITY_TRUE</code> and "false" 
+ * boolean value "true" corresponds to <code>FIDELITY_TRUE</code> and "false"
  * to <code>FIDELITY_FALSE</code>.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,27 +75,27 @@ public final class Fidelity extends EnumSyntax
 {
   private static final long serialVersionUID = 6320827847329172308L;
 
-  /** 
-   * Requests that the job is printed exactly as specified, 
+  /**
+   * Requests that the job is printed exactly as specified,
    * or rejected otherwise.
    */
   public static final Fidelity FIDELITY_TRUE = new Fidelity(0);
-  
-  /** 
+
+  /**
    * Requests that the job is printed as exactly as reasonable. This means
-   * that the print service may choose to substitute the default value 
-   * associated with that attribute, or use some other supported value that 
-   * is similar to the unsupported requested value. 
+   * that the print service may choose to substitute the default value
+   * associated with that attribute, or use some other supported value that
+   * is similar to the unsupported requested value.
    */
   public static final Fidelity FIDELITY_FALSE = new Fidelity(1);
-  
+
   private static final String[] stringTable = { "true", "false" };
   private static final Fidelity[] enumValueTable = { FIDELITY_TRUE,
                                                      FIDELITY_FALSE };
 
   /**
    * Constructs a <code>Fidelity</code> object.
-   * 
+   *
    * @param value the value
    */
   protected Fidelity(int value)
@@ -122,7 +122,7 @@ public final class Fidelity extends EnumSyntax
   {
     return "ipp-attribute-fidelity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/Finishings.java b/javax/print/attribute/standard/Finishings.java
index cd8f6753b..bb38cebc4 100644
--- a/javax/print/attribute/standard/Finishings.java
+++ b/javax/print/attribute/standard/Finishings.java
@@ -49,30 +49,30 @@ import javax.print.attribute.PrintRequestAttribute;
  * The <code>Finishings</code> attribute specifies the finishing operations
  * that the Printer applies to every copy of each printed document in the Job.
  * <p>
- * Standard enum values are: <code>NONE</code>, <code>STAPLE</code>, 
+ * Standard enum values are: <code>NONE</code>, <code>STAPLE</code>,
  * <code>COVER</code>, <code>BIND</code>, <code>SADDLE_STITCH</code>,
  * <code>EDGE_STITCH</code>.
  * <br><br>
- * The following values are more specific: 
- * <code>STAPLE_TOP_LEFT</code>, <code>STAPLE_BOTTOM_LEFT</code>, 
- * <code>STAPLE_TOP_RIGHT</code>, <code>STAPLE_BOTTOM_RIGHT</code>, 
- * <code>EDGE_STITCH_LEFT</code>, <code>EDGE_STITCH_TOP</code>, 
- * <code>EDGE_STITCH_RIGHT</code>, <code>EDGE_STITCH_BOTTOM</code>, 
- * <code>STAPLE_DUAL_LEFT</code>, <code>STAPLE_DUAL_TOP</code>, 
+ * The following values are more specific:
+ * <code>STAPLE_TOP_LEFT</code>, <code>STAPLE_BOTTOM_LEFT</code>,
+ * <code>STAPLE_TOP_RIGHT</code>, <code>STAPLE_BOTTOM_RIGHT</code>,
+ * <code>EDGE_STITCH_LEFT</code>, <code>EDGE_STITCH_TOP</code>,
+ * <code>EDGE_STITCH_RIGHT</code>, <code>EDGE_STITCH_BOTTOM</code>,
+ * <code>STAPLE_DUAL_LEFT</code>, <code>STAPLE_DUAL_TOP</code>,
  * <code>STAPLE_DUAL_RIGHT</code>, <code>STAPLE_DUAL_BOTTOM</code>.
- * </p> 
+ * </p>
  * <p>
- * <b>Note:</b> The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * <b>Note:</b> The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * </p>
  * <p>
- * <b>IPP Compatibility:</b> Finishings is an IPP 1.1 attribute. Differences 
- * to the IPP specification are that in the Java Print Service API only one 
- * enum value is supported (in IPP a set of enums). Further the enum 
+ * <b>IPP Compatibility:</b> Finishings is an IPP 1.1 attribute. Differences
+ * to the IPP specification are that in the Java Print Service API only one
+ * enum value is supported (in IPP a set of enums). Further the enum
  * <code>punch</code> is not supported.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -81,119 +81,119 @@ public class Finishings extends EnumSyntax
 {
   private static final long serialVersionUID = -627840419548391754L;
 
-  /** 
+  /**
    * Perform no finishings of the documents.
    */
   public static final Finishings NONE = new Finishings(3);
-  
-  /** 
-   * Selects binding of the documents with one or more staples.  
+
+  /**
+   * Selects binding of the documents with one or more staples.
    */
   public static final Finishings STAPLE = new Finishings(4);
-  
+
   /**
-   * Selects the use of a non-printed (or pre-printed) cover for 
+   * Selects the use of a non-printed (or pre-printed) cover for
    * the document.
    */
   public static final Finishings COVER = new Finishings(6);
-  
+
   /**
    * Selects that a binding is to be applied to the document.
    * The type and placement of the binding is site-defined.
    */
   public static final Finishings BIND = new Finishings(7);
-  
+
   /**
    * Selects binding of the documents with one or more staples
-   * along the middle fold.  
+   * along the middle fold.
    */
   public static final Finishings SADDLE_STITCH = new Finishings(8);
-  
+
   /**
-   * Selects binding of the documents with one or more staples 
-   * along one edge. 
+   * Selects binding of the documents with one or more staples
+   * along one edge.
    */
   public static final Finishings EDGE_STITCH = new Finishings(9);
-  
-  /** 
-   * Selects binding of the documents with one or more staples 
-   * in the top left corner. 
+
+  /**
+   * Selects binding of the documents with one or more staples
+   * in the top left corner.
    */
   public static final Finishings STAPLE_TOP_LEFT = new Finishings(20);
-  
-  /** 
-   * Selects binding of the documents with one or more staples in the bottom 
-   * left corner. 
+
+  /**
+   * Selects binding of the documents with one or more staples in the bottom
+   * left corner.
    */
   public static final Finishings STAPLE_BOTTOM_LEFT = new Finishings(21);
-  
+
   /**
-   * Selects binding of the documents with one or more staples in 
+   * Selects binding of the documents with one or more staples in
    * the top right corner.
    */
   public static final Finishings STAPLE_TOP_RIGHT = new Finishings(22);
-  
+
   /**
-   * Selects binding of the documents with one or more staples in 
+   * Selects binding of the documents with one or more staples in
    * the bottom right corner.
    */
   public static final Finishings STAPLE_BOTTOM_RIGHT = new Finishings(23);
-  
+
   /**
    * Selects binding of the documents with one or more staples
    * along the left edge.
    */
   public static final Finishings EDGE_STITCH_LEFT = new Finishings(24);
-  
+
   /**
-   * Selects binding of the documents with one or more staples along 
+   * Selects binding of the documents with one or more staples along
    * the top edge.
    */
   public static final Finishings EDGE_STITCH_TOP = new Finishings(25);
-  
+
   /**
-   * Selects binding of the documents with one or more staples along 
+   * Selects binding of the documents with one or more staples along
    * the right edge.
    */
   public static final Finishings EDGE_STITCH_RIGHT = new Finishings(26);
-  
+
   /**
    * Selects binding of the documents with one or more staples along
-   * the bottom edge. 
+   * the bottom edge.
    */
   public static final Finishings EDGE_STITCH_BOTTOM = new Finishings(27);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * left edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_LEFT = new Finishings(28);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * top edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_TOP = new Finishings(29);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * right edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_RIGHT = new Finishings(30);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * bottom edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_BOTTOM = new Finishings(31);
 
-  private static final String[] stringTable = { "none", "staple", null, 
+  private static final String[] stringTable = { "none", "staple", null,
                                                 "cover", "bind", "saddle-stitch",
                                                 "edge-stitch", null, null, null,
                                                 null, null, null, null, null,
                                                 null, null, "staple-top-left",
-                                                "staple-bottom-left", 
-                                                "staple-top-right", 
+                                                "staple-bottom-left",
+                                                "staple-top-right",
                                                 "staple-bottom-right",
                                                 "edge-stitch-left",
                                                 "edge-stitch-top",
@@ -203,14 +203,14 @@ public class Finishings extends EnumSyntax
                                                 "staple-dual-top",
                                                 "staple-dual-right",
                                                 "staple-dual-bottom" };
-  
-  private static final Finishings[] enumValueTable = { NONE, STAPLE, null, 
-                                                       COVER, BIND, 
+
+  private static final Finishings[] enumValueTable = { NONE, STAPLE, null,
+                                                       COVER, BIND,
                                                        SADDLE_STITCH,
-                                                       EDGE_STITCH, null, 
-                                                       null, null, null, 
-                                                       null, null, null, 
-                                                       null, null, null, 
+                                                       EDGE_STITCH, null,
+                                                       null, null, null,
+                                                       null, null, null,
+                                                       null, null, null,
                                                        STAPLE_TOP_LEFT,
                                                        STAPLE_BOTTOM_LEFT,
                                                        STAPLE_TOP_RIGHT,
@@ -223,10 +223,10 @@ public class Finishings extends EnumSyntax
                                                        STAPLE_DUAL_TOP,
                                                        STAPLE_DUAL_RIGHT,
                                                        STAPLE_DUAL_BOTTOM };
-  
+
   /**
    * Constructs a <code>Finishings</code> object.
-   * 
+   *
    * @param value the value
    */
   protected Finishings(int value)
@@ -253,7 +253,7 @@ public class Finishings extends EnumSyntax
   {
     return "finishings";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -283,5 +283,5 @@ public class Finishings extends EnumSyntax
   protected int getOffset()
   {
     return 3;
-  }  
+  }
 }
diff --git a/javax/print/attribute/standard/JobHoldUntil.java b/javax/print/attribute/standard/JobHoldUntil.java
index 7c137ccd1..97d3c15ad 100644
--- a/javax/print/attribute/standard/JobHoldUntil.java
+++ b/javax/print/attribute/standard/JobHoldUntil.java
@@ -1,4 +1,4 @@
-/* JobHoldUntil.java -- 
+/* JobHoldUntil.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,17 +48,17 @@ import javax.print.attribute.PrintRequestAttribute;
 /**
  * The <code>JobHoldUntil</code> attribute specifies the date
  * and the time at which a print job must become a candidate
- * for printing. 
+ * for printing.
  * <p>
  * <b>IPP Compatibility:</b> JobHoldUntil is an IPP 1.1 attribute.
  * However the attribute in IPP is based on keywords of named
  * time periods like day-time or evening. It will depend on the
- * concrete implementation of a print service how a mapping of the 
+ * concrete implementation of a print service how a mapping of the
  * detailed provided date and time of this attribute to the named
  * keyword or an alternate extension attribute will be done. E.g.
  * CUPS supports also a HH:MM format as extension to the keywords.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobHoldUntil extends DateTimeSyntax
@@ -83,7 +83,7 @@ public final class JobHoldUntil extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobImpressions.java b/javax/print/attribute/standard/JobImpressions.java
index a2c7d4dd6..11d51cac8 100644
--- a/javax/print/attribute/standard/JobImpressions.java
+++ b/javax/print/attribute/standard/JobImpressions.java
@@ -1,4 +1,4 @@
-/* JobImpressions.java -- 
+/* JobImpressions.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,16 +45,16 @@ import javax.print.attribute.PrintRequestAttribute;
 /**
  * The <code>JobImpressions</code> printing attribute specifies
  * the total size in number of impressions of the documents
- * of a a print job. 
+ * of a a print job.
  * <p>
- * An impression is specified by the IPP specification as the image 
- * (possibly many print-stream pages in different configurations) 
+ * An impression is specified by the IPP specification as the image
+ * (possibly many print-stream pages in different configurations)
  * imposed onto a single media sheet. This attribute must not include
  * a multiplication factor from the number of copies which maybe specified
  * in a Copies attribute.
  * </p>
  * <p>
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -67,14 +67,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobKOctets
  * @see javax.print.attribute.standard.JobMediaSheets
- * 
+ *
  * @author Michael Koch
  */
 public final class JobImpressions extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = 8225537206784322464L;
-  
+
   /**
    * Creates a <code>JobImpressions</code> object.
    *
@@ -89,13 +89,13 @@ public final class JobImpressions extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobImpressionsCompleted.java b/javax/print/attribute/standard/JobImpressionsCompleted.java
index 55d3fd6b9..d1594ea02 100644
--- a/javax/print/attribute/standard/JobImpressionsCompleted.java
+++ b/javax/print/attribute/standard/JobImpressionsCompleted.java
@@ -1,4 +1,4 @@
-/* JobImpressionsCompleted.java -- 
+/* JobImpressionsCompleted.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintJobAttribute;
  * The <code>JobImpressionsCompleted</code> printing attribute reports
  * the number of impressions already processed.
  * <p>
- * An impression is specified by the IPP specification as the image imposed 
- * onto a single media sheet. This attribute will not include a multiplication 
+ * An impression is specified by the IPP specification as the image imposed
+ * onto a single media sheet. This attribute will not include a multiplication
  * factor from the number of copies.
  * </p>
  * <p>
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * </p>
  * <p>
@@ -58,14 +58,14 @@ import javax.print.attribute.PrintJobAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobMediaSheetsCompleted
  * @see javax.print.attribute.standard.JobKOctetsProcessed
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobImpressionsCompleted extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 6722648442432393294L;
-  
+
   /**
    * Creates a <code>JobImpressionsCompleted</code> object.
    *
@@ -80,13 +80,13 @@ public final class JobImpressionsCompleted extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobImpressionsSupported.java b/javax/print/attribute/standard/JobImpressionsSupported.java
index 5be3fc0a6..583db4e24 100644
--- a/javax/print/attribute/standard/JobImpressionsSupported.java
+++ b/javax/print/attribute/standard/JobImpressionsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The <code>JobImpressionsSupported</code> printing attribute specifies the 
- * supported range of values for the 
+ * The <code>JobImpressionsSupported</code> printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobImpressions} attribute.
  * <p>
  * <b>IPP Compatibility:</b> JobImpressionsSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,7 +59,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
   private static final long serialVersionUID = -4887354803843173692L;
 
   /**
-   * Constructs a <code>JobImpressionsSupported</code> object with the 
+   * Constructs a <code>JobImpressionsSupported</code> object with the
    * given range of supported job impressions values.
    *
    * @param lowerBound the lower bound value
@@ -71,24 +71,24 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
   public JobImpressionsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobImpressionsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/JobKOctets.java b/javax/print/attribute/standard/JobKOctets.java
index ac9a7eff6..c4427eaa5 100644
--- a/javax/print/attribute/standard/JobKOctets.java
+++ b/javax/print/attribute/standard/JobKOctets.java
@@ -1,4 +1,4 @@
-/* JobKOctets.java -- 
+/* JobKOctets.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,12 +48,12 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * The supplied value has to be rounded up, so that a range between
  * 1 and 1024 octects is specified as 1 and a range between 1025 and
- * 2048 octects as 2, etc.  This attribute must not include a multiplication 
- * factor from the number of copies which maybe specified in a Copies 
+ * 2048 octects as 2, etc.  This attribute must not include a multiplication
+ * factor from the number of copies which maybe specified in a Copies
  * attribute.
  * </p>
  * <p>
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -66,17 +66,17 @@ import javax.print.attribute.PrintRequestAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobMediaSheets
  * @see javax.print.attribute.standard.JobImpressions
- * 
+ *
  * @author Michael Koch
  */
 public final class JobKOctets extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -8959710146498202869L;
-  
+
   /**
    * Creates a <code>JobKOctets</code> object.
-   * The value is in units of K (1024) octets rounded up to the next highest K. 
+   * The value is in units of K (1024) octets rounded up to the next highest K.
    *
    * @param value the number of K octets
    *
@@ -89,13 +89,13 @@ public final class JobKOctets extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobKOctetsProcessed.java b/javax/print/attribute/standard/JobKOctetsProcessed.java
index 34616edfe..55bee6a05 100644
--- a/javax/print/attribute/standard/JobKOctetsProcessed.java
+++ b/javax/print/attribute/standard/JobKOctetsProcessed.java
@@ -1,4 +1,4 @@
-/* JobKOctetsProcessed.java -- 
+/* JobKOctetsProcessed.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,11 +46,11 @@ import javax.print.attribute.PrintJobAttribute;
  * the total number of octets already processed in K octets units.
  * <p>
  * The supplied value will be rounded up to the next highest K octets.
- * This attribute will not include a multiplication factor from the number 
+ * This attribute will not include a multiplication factor from the number
  * of copies.
  * </p>
  * <p>
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * </p>
  * <p>
@@ -58,17 +58,17 @@ import javax.print.attribute.PrintJobAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobMediaSheetsCompleted
  * @see javax.print.attribute.standard.JobImpressionsCompleted
- * 
+ *
  * @author Michael Koch
  */
 public final class JobKOctetsProcessed extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = -6265238509657881806L;
-  
+
   /**
    * Creates a <code>JobKOctetsProcessed</code> object.
-   * The value is in units of K (1024) octets rounded up to the next highest K. 
+   * The value is in units of K (1024) octets rounded up to the next highest K.
    *
    * @param value the number of processed K octets
    *
@@ -81,13 +81,13 @@ public final class JobKOctetsProcessed extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobKOctetsSupported.java b/javax/print/attribute/standard/JobKOctetsSupported.java
index 4936fd49f..6990a53ee 100644
--- a/javax/print/attribute/standard/JobKOctetsSupported.java
+++ b/javax/print/attribute/standard/JobKOctetsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The <code>JobKOctetsSupported</code> printing attribute specifies the 
- * supported range of values for the 
+ * The <code>JobKOctetsSupported</code> printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobKOctets} attribute.
  * <p>
  * <b>IPP Compatibility:</b> JobKOctetsSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -71,24 +71,24 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
   public JobKOctetsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobKOctetsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/JobMediaSheets.java b/javax/print/attribute/standard/JobMediaSheets.java
index 17cf96f33..c92cf3040 100644
--- a/javax/print/attribute/standard/JobMediaSheets.java
+++ b/javax/print/attribute/standard/JobMediaSheets.java
@@ -1,4 +1,4 @@
-/* JobMediaSheets.java -- 
+/* JobMediaSheets.java --
    Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * was specified for the job.
  * </p>
  * <p>
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -64,14 +64,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobKOctets
  * @see javax.print.attribute.standard.JobImpressions
- * 
+ *
  * @author Michael Koch
  */
 public class JobMediaSheets extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = 408871131531979741L;
-  
+
   /**
    * Creates a <code>JobMediaSheets</code> object.
    *
@@ -86,13 +86,13 @@ public class JobMediaSheets extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/javax/print/attribute/standard/JobMediaSheetsCompleted.java
index 353c044ec..5ec7d8d63 100644
--- a/javax/print/attribute/standard/JobMediaSheetsCompleted.java
+++ b/javax/print/attribute/standard/JobMediaSheetsCompleted.java
@@ -1,4 +1,4 @@
-/* JobMediaSheetsCompleted.java -- 
+/* JobMediaSheetsCompleted.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,9 +43,9 @@ import javax.print.attribute.PrintJobAttribute;
 
 /**
  * The <code>JobMediaSheetsCompleted</code> printing attribute reports
- * the number of media sheets already processed. 
+ * the number of media sheets already processed.
  * <p>
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * </p>
  * <p>
@@ -53,14 +53,14 @@ import javax.print.attribute.PrintJobAttribute;
  * </p>
  * @see javax.print.attribute.standard.JobImpressionsCompleted
  * @see javax.print.attribute.standard.JobKOctetsProcessed
- * 
+ *
  * @author Michael Koch
  */
 public final class JobMediaSheetsCompleted extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 1739595973810840475L;
-  
+
   /**
    * Creates a <code>JobMediaSheetsCompleted</code> object.
    *
@@ -75,13 +75,13 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobMediaSheetsSupported.java b/javax/print/attribute/standard/JobMediaSheetsSupported.java
index d9a0ed2df..32d6ac54d 100644
--- a/javax/print/attribute/standard/JobMediaSheetsSupported.java
+++ b/javax/print/attribute/standard/JobMediaSheetsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The <code>JobMediaSheetsSupported</code> printing attribute specifies the 
- * supported range of values for the 
+ * The <code>JobMediaSheetsSupported</code> printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobMediaSheets} attribute.
  * <p>
  * <b>IPP Compatibility:</b> JobMediaSheetsSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,7 +59,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
   private static final long serialVersionUID = 2953685470388672940L;
 
   /**
-   * Constructs a <code>JobMediaSheetsSupported</code> object with the 
+   * Constructs a <code>JobMediaSheetsSupported</code> object with the
    * given range of supported job media sheets values.
    *
    * @param lowerBound the lower bound value
@@ -71,24 +71,24 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
   public JobMediaSheetsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobMediaSheetsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/JobMessageFromOperator.java b/javax/print/attribute/standard/JobMessageFromOperator.java
index f2a589af4..bf1dedb96 100644
--- a/javax/print/attribute/standard/JobMessageFromOperator.java
+++ b/javax/print/attribute/standard/JobMessageFromOperator.java
@@ -1,4 +1,4 @@
-/* JobMessageFromOperator.java -- 
+/* JobMessageFromOperator.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,15 +45,15 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>JobMessageFromOperator</code> printing attribute provides 
+ * The <code>JobMessageFromOperator</code> printing attribute provides
  * a message from an operator or a system administrator related to the
  * print job. This may include information why a certain action has been
  * taken on the print job like a modification.
  * <p>
- * <b>IPP Compatibility:</b> JobMessageFromOperator is an IPP 1.1 
+ * <b>IPP Compatibility:</b> JobMessageFromOperator is an IPP 1.1
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobMessageFromOperator extends TextSyntax
@@ -80,7 +80,7 @@ public final class JobMessageFromOperator extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobName.java b/javax/print/attribute/standard/JobName.java
index 5f5310e96..dc84cb61e 100644
--- a/javax/print/attribute/standard/JobName.java
+++ b/javax/print/attribute/standard/JobName.java
@@ -1,4 +1,4 @@
-/* JobName.java -- 
+/* JobName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,12 +46,12 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>JobName</code> printing attribute provides the name of a 
+ * The <code>JobName</code> printing attribute provides the name of a
  * print job for identification.
  * <p>
  * <b>IPP Compatibility:</b> JobName is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobName extends TextSyntax
@@ -78,7 +78,7 @@ public final class JobName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobOriginatingUserName.java b/javax/print/attribute/standard/JobOriginatingUserName.java
index 62073daa6..c7246ddc5 100644
--- a/javax/print/attribute/standard/JobOriginatingUserName.java
+++ b/javax/print/attribute/standard/JobOriginatingUserName.java
@@ -1,4 +1,4 @@
-/* JobOriginatingUserName.java -- 
+/* JobOriginatingUserName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>JobOriginatingUserName</code> attribute specifies the name of 
+ * The <code>JobOriginatingUserName</code> attribute specifies the name of
  * the user which submitted the print job.
  * <p>
  * <b>IPP Compatibility:</b> JobOriginatingUserName is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobOriginatingUserName extends TextSyntax
@@ -77,7 +77,7 @@ public final class JobOriginatingUserName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobPriority.java b/javax/print/attribute/standard/JobPriority.java
index 88fc685b8..0f669a06d 100644
--- a/javax/print/attribute/standard/JobPriority.java
+++ b/javax/print/attribute/standard/JobPriority.java
@@ -1,4 +1,4 @@
-/* JobPriority.java -- 
+/* JobPriority.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,14 +47,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * The <code>JobPriority</code> printing attribute specifies
  * the priority for scheduling a job on the print service.
  * <p>
- * A client may specify any value between 1 (lowest priority) and 100 
+ * A client may specify any value between 1 (lowest priority) and 100
  * (highest priority). A print service prints jobs with a priority
  * value of n before those with a priority value of n-1.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> JobPriority is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobPriority extends IntegerSyntax
@@ -82,7 +82,7 @@ public final class JobPriority extends IntegerSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobPrioritySupported.java b/javax/print/attribute/standard/JobPrioritySupported.java
index e7ebca2db..b2e577283 100644
--- a/javax/print/attribute/standard/JobPrioritySupported.java
+++ b/javax/print/attribute/standard/JobPrioritySupported.java
@@ -1,4 +1,4 @@
-/* JobPrioritySupported.java -- 
+/* JobPrioritySupported.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ import javax.print.attribute.SupportedValuesAttribute;
  * <p>
  * A client may specify any JobPriority value between 1 and 100. If a
  * print service supports fewer priority levels it indicates the maximum
- * levels through this attribute. The print service then automatically 
+ * levels through this attribute. The print service then automatically
  * maps the job priority value provided by the client in an even distribution
  * over the whole range of 1 to 100.
  * </p>
@@ -56,7 +56,7 @@ import javax.print.attribute.SupportedValuesAttribute;
  * <b>IPP Compatibility:</b> JobPrioritySupported is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.JobPriority
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobPrioritySupported extends IntegerSyntax
@@ -84,7 +84,7 @@ public final class JobPrioritySupported extends IntegerSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/JobSheets.java b/javax/print/attribute/standard/JobSheets.java
index a930f63cf..7d20692b9 100644
--- a/javax/print/attribute/standard/JobSheets.java
+++ b/javax/print/attribute/standard/JobSheets.java
@@ -45,11 +45,11 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The <code>JobSheets</code> printing attribute specifies if a
- * job start/end sheets should be printed. 
+ * job start/end sheets should be printed.
  * <p>
  * <b>IPP Compatibility:</b> JobSheets is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,24 +59,24 @@ public class JobSheets extends EnumSyntax
   private static final long serialVersionUID = -4735258056132519759L;
 
   /**
-   * No job sheet is printed. 
+   * No job sheet is printed.
    */
   public static final JobSheets NONE = new JobSheets(0);
-  
+
   /**
-   * The standard job sheet is printed. The sheet and if it 
+   * The standard job sheet is printed. The sheet and if it
    * is printed only as start sheet or also as end sheet is
    * site specific.
    */
   public static final JobSheets STANDARD = new JobSheets(1);
 
   private static final String[] stringTable = { "none", "standard" };
-  
+
   private static final JobSheets[] enumValueTable = { NONE, STANDARD };
-  
+
   /**
    * Constructs a <code>JobSheets</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobSheets(int value)
@@ -103,7 +103,7 @@ public class JobSheets extends EnumSyntax
   {
     return "job-sheets";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/JobState.java b/javax/print/attribute/standard/JobState.java
index fa769bbf3..5efbe08ea 100644
--- a/javax/print/attribute/standard/JobState.java
+++ b/javax/print/attribute/standard/JobState.java
@@ -50,11 +50,11 @@ import javax.print.attribute.PrintJobAttribute;
  * attribute provides further detailed information about
  * the given job state. Detailed information about the job
  * state and job state reasons can be found in the RFC 2911.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> JobState is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -67,12 +67,12 @@ public class JobState extends EnumSyntax
    * The job state is currently unknown.
    */
   public static final JobState UNKNOWN = new JobState(0);
-  
+
   /**
    * The job is pending processing.
    */
   public static final JobState PENDING = new JobState(3);
-  
+
   /**
    * The job is currently not a candidate for printing because
    * of reasons reported by the job-state-reasons attribute. If
@@ -80,52 +80,52 @@ public class JobState extends EnumSyntax
    * pending state.
    */
   public static final JobState PENDING_HELD = new JobState(4);
-  
+
   /**
    * The job is currently processed.
    */
   public static final JobState PROCESSING = new JobState(5);
-  
+
   /**
    * The job's processing has stopped. The job-state-reasons
    * attribute may indicate the reason(s). The job will return
    * to the processing state if the reasons are no longer present.
    */
   public static final JobState PROCESSING_STOPPED = new JobState(6);
-  
+
   /**
    * The job has been canceled by the client.
    */
   public static final JobState CANCELED = new JobState(7);
-  
+
   /**
    * The job has been aborted by the system.
    */
   public static final JobState ABORTED = new JobState(8);
-  
+
   /**
    * The job has completed successfully.
    */
   public static final JobState COMPLETED = new JobState(9);
 
 
-  private static final String[] stringTable = { "unknown", null, null, 
+  private static final String[] stringTable = { "unknown", null, null,
                                                 "pending", "pending-held",
-                                                "processing", 
+                                                "processing",
                                                 "processing-stopped",
-                                                "canceled", "aborted", 
+                                                "canceled", "aborted",
                                                 "completed"};
-  
+
   private static final JobState[] enumValueTable = { UNKNOWN, null, null,
                                                      PENDING, PENDING_HELD,
                                                      PROCESSING,
                                                      PROCESSING_STOPPED,
                                                      CANCELED, ABORTED,
                                                      COMPLETED };
-  
+
   /**
    * Constructs a <code>JobState</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobState(int value)
@@ -152,7 +152,7 @@ public class JobState extends EnumSyntax
   {
     return "job-state";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/JobStateReason.java b/javax/print/attribute/standard/JobStateReason.java
index b8420b180..52aae1562 100644
--- a/javax/print/attribute/standard/JobStateReason.java
+++ b/javax/print/attribute/standard/JobStateReason.java
@@ -45,13 +45,13 @@ import javax.print.attribute.EnumSyntax;
  * The <code>JobStateReason</code> attribute provides additional
  * information about the current state of a job. Its always part
  * of the {@link javax.print.attribute.standard.JobStateReasons}
- * printing attribute. 
+ * printing attribute.
  * <p>
- * <b>IPP Compatibility:</b> JobStateReason is not an IPP 1.1 
+ * <b>IPP Compatibility:</b> JobStateReason is not an IPP 1.1
  * attribute itself but used inside the <code>JobStateReasons</code>
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,179 +65,179 @@ public class JobStateReason extends EnumSyntax
    * data for processing.
    */
   public static final JobStateReason JOB_INCOMING = new JobStateReason(0);
-  
+
   /**
    * The printer is expecting additional document data before it
    * can move this job into the processing state.
    */
   public static final JobStateReason JOB_DATA_INSUFFICIENT = new JobStateReason(1);
-  
+
   /**
    * The printer is unable to access one or more documents provided
    * by reference in the print job.
    */
   public static final JobStateReason DOCUMENT_ACCESS_ERROR = new JobStateReason(2);
-  
+
   /**
    * The printer has not received the whole job submission. This
    * indicates no reason for the interruption.
    */
   public static final JobStateReason SUBMISSION_INTERRUPTED = new JobStateReason(3);
-  
+
   /**
    * The printer transfers the job to the actual output device.
    */
   public static final JobStateReason JOB_OUTGOING = new JobStateReason(4);
-  
+
   /**
-   * The job was submitted with a <code>JobHoldUntil</code> attribute which 
-   * specifies a time period still in the future and causes the job to 
+   * The job was submitted with a <code>JobHoldUntil</code> attribute which
+   * specifies a time period still in the future and causes the job to
    * be on hold.
    */
   public static final JobStateReason JOB_HOLD_UNTIL_SPECIFIED = new JobStateReason(5);
-  
+
   /**
    * One or more resources needed by the job are not ready. E.g. needed
    * media type.
    */
   public static final JobStateReason RESOURCES_ARE_NOT_READY = new JobStateReason(6);
-  
+
   /**
    * The printer stopped partly.
    */
   public static final JobStateReason PRINTER_STOPPED_PARTLY = new JobStateReason(7);
-  
+
   /**
    * The printer stopped complete.
    */
   public static final JobStateReason PRINTER_STOPPED = new JobStateReason(8);
-  
+
   /**
    * The printer is currently interpreting the jobs document data.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_INTERPRETING = new JobStateReason(9);
-  
+
   /**
    * The printer has queued the document data.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_QUEUED = new JobStateReason(10);
-  
+
   /**
    * The printer is transforming the document data to another representation.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_TRANSFORMING = new JobStateReason(11);
-  
+
   /**
    * The job is queued for marking.
    */
   public static final JobStateReason JOB_QUEUED_FOR_MARKER = new JobStateReason(12);
-  
+
   /**
    * The job is currently printing.
    */
   public static final JobStateReason JOB_PRINTING = new JobStateReason(13);
-  
+
   /**
    * The job was canceled by the user (the owner of the job).
    */
   public static final JobStateReason JOB_CANCELED_BY_USER = new JobStateReason(14);
-  
+
   /**
    * The job was canceled by the operator.
    */
   public static final JobStateReason JOB_CANCELED_BY_OPERATOR = new JobStateReason(15);
-  
+
   /**
    * The job was canceled by an unidentified local user at the device.
    */
   public static final JobStateReason JOB_CANCELED_AT_DEVICE = new JobStateReason(16);
-  
+
   /**
    * The job has been aborted by the system.
    */
   public static final JobStateReason ABORTED_BY_SYSTEM = new JobStateReason(17);
-  
+
   /**
    * The printer aborted the job because of an unsupported compression while
    * trying to decompress the document data.
    */
   public static final JobStateReason UNSUPPORTED_COMPRESSION = new JobStateReason(18);
-  
+
   /**
    * The printer aborted the job because of a compression error while
    * trying to decompress the document data. If this state is given the test
    * for supported compression has already been passed.
    */
   public static final JobStateReason COMPRESSION_ERROR = new JobStateReason(19);
-  
+
   /**
    * The printer aborted the job because of the document format is not supported.
-   * This may happen if a job is specified as application/octet-stream format. 
+   * This may happen if a job is specified as application/octet-stream format.
    */
   public static final JobStateReason UNSUPPORTED_DOCUMENT_FORMAT = new JobStateReason(20);
-  
+
   /**
-   * The printer aborted the job because of an error in the document data. 
+   * The printer aborted the job because of an error in the document data.
    */
   public static final JobStateReason DOCUMENT_FORMAT_ERROR = new JobStateReason(21);
-  
+
   /**
    * The client has either canceled the job or the printer aborted the job.
-   * However the printer still performs some action on the job e.g. to cleanup. 
+   * However the printer still performs some action on the job e.g. to cleanup.
    */
   public static final JobStateReason PROCESSING_TO_STOP_POINT = new JobStateReason(22);
-  
+
   /**
    * The printer is offline and therefore is not accepting jobs.
    */
   public static final JobStateReason SERVICE_OFF_LINE = new JobStateReason(23);
-  
+
   /**
-   * The printer completed the job successfully. 
+   * The printer completed the job successfully.
    */
   public static final JobStateReason JOB_COMPLETED_SUCCESSFULLY = new JobStateReason(24);
-  
+
   /**
    * The printer completed the job with warnings.
    */
   public static final JobStateReason JOB_COMPLETED_WITH_WARNINGS = new JobStateReason(25);
-  
+
   /**
    * The printer completed the job with errors.
    */
   public static final JobStateReason JOB_COMPLETED_WITH_ERRORS = new JobStateReason(26);
-  
+
   /**
-   * The job is retained and is able to be restared. 
+   * The job is retained and is able to be restared.
    */
   public static final JobStateReason JOB_RESTARTABLE = new JobStateReason(27);
-  
+
   /**
    * The printer has forwarded the job to the actual output device. This device
    * is not capable of reporting the state back so that the job state is set
-   * to completed by the printer. 
+   * to completed by the printer.
    */
   public static final JobStateReason QUEUED_IN_DEVICE = new JobStateReason(28);
 
-  private static final String[] stringTable = 
-    { "job-incoming", "job-data-insufficient", "document-access-error", 
+  private static final String[] stringTable =
+    { "job-incoming", "job-data-insufficient", "document-access-error",
       "submission-interrupted", "job-outgoing", "job-hold-until-specified",
       "resources-are-not-ready", "printer-stopped-partly", "printer-stopped",
-      "job-interpreting", "job-queued", "job-transforming", 
+      "job-interpreting", "job-queued", "job-transforming",
       "job-queued-for-marker", "job-printing", "job-canceled-by-user",
-      "job-canceled-by-operator", "job-canceled-at-device", 
+      "job-canceled-by-operator", "job-canceled-at-device",
       "aborted-by-system", "unsupported-compression", "compression-error",
-      "unsupported-document-format", "document-format-error", 
-      "processing-to-stop-point", "service-off-line", 
-      "job-completed-successfully", "job-completed-with-warnings", 
+      "unsupported-document-format", "document-format-error",
+      "processing-to-stop-point", "service-off-line",
+      "job-completed-successfully", "job-completed-with-warnings",
       "job-completed-with-errors", "job-restartable", "queued-in-device" };
-  
-  private static final JobStateReason[] enumValueTable = 
-    { JOB_INCOMING, JOB_DATA_INSUFFICIENT, DOCUMENT_ACCESS_ERROR, 
-      SUBMISSION_INTERRUPTED, JOB_OUTGOING, JOB_HOLD_UNTIL_SPECIFIED, 
+
+  private static final JobStateReason[] enumValueTable =
+    { JOB_INCOMING, JOB_DATA_INSUFFICIENT, DOCUMENT_ACCESS_ERROR,
+      SUBMISSION_INTERRUPTED, JOB_OUTGOING, JOB_HOLD_UNTIL_SPECIFIED,
       RESOURCES_ARE_NOT_READY, PRINTER_STOPPED_PARTLY, PRINTER_STOPPED,
       JOB_INTERPRETING, JOB_QUEUED, JOB_TRANSFORMING, JOB_QUEUED_FOR_MARKER,
       JOB_PRINTING, JOB_CANCELED_BY_USER, JOB_CANCELED_BY_OPERATOR,
@@ -246,10 +246,10 @@ public class JobStateReason extends EnumSyntax
       PROCESSING_TO_STOP_POINT, SERVICE_OFF_LINE, JOB_COMPLETED_SUCCESSFULLY,
       JOB_COMPLETED_WITH_WARNINGS, JOB_COMPLETED_WITH_ERRORS, JOB_RESTARTABLE,
       QUEUED_IN_DEVICE };
-  
+
   /**
    * Constructs a <code>JobStateReason</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobStateReason(int value)
@@ -276,7 +276,7 @@ public class JobStateReason extends EnumSyntax
   {
     return "job-state-reason";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/JobStateReasons.java b/javax/print/attribute/standard/JobStateReasons.java
index 503c06c02..18c404eb7 100644
--- a/javax/print/attribute/standard/JobStateReasons.java
+++ b/javax/print/attribute/standard/JobStateReasons.java
@@ -44,14 +44,14 @@ import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The <code>JobStateReasons</code> attribute provides the set of 
- * additional informations available about the current state of a print job. 
+ * The <code>JobStateReasons</code> attribute provides the set of
+ * additional informations available about the current state of a print job.
  * <p>
  * <b>IPP Compatibility:</b> JobStateReasons is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.JobState
  * @see javax.print.attribute.standard.JobStateReason
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -62,7 +62,7 @@ public final class JobStateReasons extends HashSet<JobStateReason>
 
   /**
    * Constructs an empty <code>JobStateReasons</code> attribute.
-   */  
+   */
   public JobStateReasons()
   {
     super();
@@ -71,10 +71,10 @@ public final class JobStateReasons extends HashSet<JobStateReason>
   /**
    * Constructs an empty <code>JobStateReasons</code> attribute
    * with the given initial capacity and load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
    * @param loadFactor the load factor of the underlying HashSet.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity &lt; 0
    * @throws IllegalArgumentException if initialCapacity or loadFactor &lt; 0
    */
@@ -86,9 +86,9 @@ public final class JobStateReasons extends HashSet<JobStateReason>
   /**
    * Constructs an empty <code>JobStateReasons</code> attribute
    * with the given initial capacity and the default load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity &lt; 0
    */
   public JobStateReasons(int initialCapacity)
@@ -99,12 +99,12 @@ public final class JobStateReasons extends HashSet<JobStateReason>
   /**
    * Constructs a <code>JobStateReasons</code> attribute
    * with the content of the given collection.
-   * 
+   *
    * @param collection the collection for the initial values.
-   * 
-   * @throws NullPointerException if collection or any value is 
+   *
+   * @throws NullPointerException if collection or any value is
    * <code>null</code>.
-   * @throws ClassCastException if values of collection are not of type 
+   * @throws ClassCastException if values of collection are not of type
    * <code>JobStateReason</code>.
    */
   public JobStateReasons(Collection<JobStateReason> collection)
@@ -116,10 +116,10 @@ public final class JobStateReasons extends HashSet<JobStateReason>
 
   /**
    * Adds the given job state reason object to the set.
-   * 
+   *
    * @param o the reason of type <code>JobStateReason</code>.
    * @return <code>true</code> if set changed, <code>false</code> otherwise.
-   * 
+   *
    * @throws NullPointerException if given object is <code>null</code>.
    * @throws ClassCastException if given object is not an instance of
    * <code>JobStateReason</code>.
@@ -127,11 +127,11 @@ public final class JobStateReasons extends HashSet<JobStateReason>
   public boolean add(JobStateReason o)
   {
     if (o == null)
-      throw new NullPointerException("reason is null");  
-    
+      throw new NullPointerException("reason is null");
+
     return add(o);
   }
-  
+
   /**
    * Returns category of this class.
    *
diff --git a/javax/print/attribute/standard/Media.java b/javax/print/attribute/standard/Media.java
index 4c0af0ed1..dad8d35a0 100644
--- a/javax/print/attribute/standard/Media.java
+++ b/javax/print/attribute/standard/Media.java
@@ -50,7 +50,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * The media to be used can be specified in three ways represented
  * by the media subclasses {@link javax.print.attribute.standard.MediaTray},
- * {@link javax.print.attribute.standard.MediaName} and 
+ * {@link javax.print.attribute.standard.MediaName} and
  * {@link javax.print.attribute.standard.MediaSizeName}:
  * <ul>
  * <li>Selection by paper source - selection of printer tray to be used.</li>
@@ -59,11 +59,11 @@ import javax.print.attribute.PrintRequestAttribute;
  * </ul>
  * Each of the sublcasses represents the IPP attribute <code>media</code>
  * and provides predefined values to be used.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> Media is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -74,14 +74,14 @@ public abstract class Media extends EnumSyntax
 
   /**
    * Constructs a <code>Media</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected Media(int value)
   {
     super(value);
   }
-    
+
   /**
    * Tests if the given object is equal to this object.
    * The objects are considered equal if both are of the same
@@ -89,14 +89,14 @@ public abstract class Media extends EnumSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (obj == null)
       return false;
-    
+
     return (obj.getClass() == this.getClass()
             && ((Media) obj).getValue() == this.getValue());
   }
diff --git a/javax/print/attribute/standard/MediaName.java b/javax/print/attribute/standard/MediaName.java
index 2fa7cea09..78a052f06 100644
--- a/javax/print/attribute/standard/MediaName.java
+++ b/javax/print/attribute/standard/MediaName.java
@@ -40,53 +40,53 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * <code>MediaName</code> is a subclass of the <code>Media</code> printing 
- * attribute and provides selection of media to be used by the means of 
- * defined names. The class pre-defines commonly available media names. 
- * This media type enumeration may be used in alternative to 
+ * <code>MediaName</code> is a subclass of the <code>Media</code> printing
+ * attribute and provides selection of media to be used by the means of
+ * defined names. The class pre-defines commonly available media names.
+ * This media type enumeration may be used in alternative to
  * MediaSizeName/MediaTray.
  * <p>
  * <b>IPP Compatibility:</b> MediaName is not an IPP 1.1 attribute on its own.
  * It provides parts of the <code>media</code> attribute type values.
  * </p>
- * 
+ *
  * @author Sven de Marothy
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class MediaName extends Media
 {
   private static final long serialVersionUID = 4653117714524155448L;
-  
+
   /**
    * The North American letter white medium.
    */
   public static final MediaName NA_LETTER_WHITE = new MediaName(0);
-  
+
   /**
    * The North American letter transparent medium.
    */
   public static final MediaName NA_LETTER_TRANSPARENT = new MediaName(1);
-  
+
   /**
    * The ISO A4 white medium.
    */
   public static final MediaName ISO_A4_WHITE = new MediaName(2);
-  
+
   /**
-   * The ISO A4 transparent medium. 
+   * The ISO A4 transparent medium.
    */
   public static final MediaName ISO_A4_TRANSPARENT = new MediaName(3);
 
-  private static final String[] stringTable = { "na-letter-white", 
-                                                "na-letter-transparent", 
+  private static final String[] stringTable = { "na-letter-white",
+                                                "na-letter-transparent",
                                                 "iso-a4-white",
                                                 "iso-a4-transparent" };
-  
-  private static final MediaName[] enumValueTable = { NA_LETTER_WHITE, 
-                                                      NA_LETTER_TRANSPARENT, 
-                                                      ISO_A4_WHITE, 
-                                                      ISO_A4_TRANSPARENT };  
-  
+
+  private static final MediaName[] enumValueTable = { NA_LETTER_WHITE,
+                                                      NA_LETTER_TRANSPARENT,
+                                                      ISO_A4_WHITE,
+                                                      ISO_A4_TRANSPARENT };
+
   /**
    * Creates a <code>MediaName</code> object.
    *
@@ -96,7 +96,7 @@ public class MediaName extends Media
   {
     super( i );
   }
- 
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -118,4 +118,3 @@ public class MediaName extends Media
     return enumValueTable;
   }
 }
-
diff --git a/javax/print/attribute/standard/MediaPrintableArea.java b/javax/print/attribute/standard/MediaPrintableArea.java
index 84ebd61ce..721999204 100644
--- a/javax/print/attribute/standard/MediaPrintableArea.java
+++ b/javax/print/attribute/standard/MediaPrintableArea.java
@@ -1,4 +1,4 @@
-/* MediaPrintableArea.java -- 
+/* MediaPrintableArea.java --
    Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,10 +47,10 @@ import javax.print.attribute.PrintRequestAttribute;
  * The <code>MediaPrintableArea</code> attribute specifies the area
  * of a media sheet which is available for printing.
  * <p>
- * Due to hardware limitation its not possible with most printers to use the 
- * whole area of a media sheet for printing. This attribute defines the area 
+ * Due to hardware limitation its not possible with most printers to use the
+ * whole area of a media sheet for printing. This attribute defines the area
  * for printing through the values of the upper left corner position (x,y)
- * on the sheet and the available width and height of the area. The units of 
+ * on the sheet and the available width and height of the area. The units of
  * the values are determined by two defined constants:
  * <ul>
  * <li>INCH - defines an inch</li>
@@ -59,12 +59,12 @@ import javax.print.attribute.PrintRequestAttribute;
  * </p>
  * <p>
  * <b>Internal storage:</b><br>
- * The values of x, y, width and height are stored internally in micrometers. 
+ * The values of x, y, width and height are stored internally in micrometers.
  * The values of the provided constants for inch (value 25400) and millimeters
  * (value 1000) are used as conversion factors to the internal storage units.
  * To get the internal micrometers values a multiplication of a given
  * size value with its units constant value is done. Retrieving the size value
- * for specific units is done by dividing the internal stored value by the 
+ * for specific units is done by dividing the internal stored value by the
  * units constant value.
  * </p>
  * <p>
@@ -84,13 +84,13 @@ public final class MediaPrintableArea
    * The actual value is the conversion factor to micrometers.
    */
   public static final int INCH = 25400;
-  
+
   /**
    * Constant for the units of millimeters.
    * The actual value is the conversion factor to micrometers.
    */
   public static final int MM = 1000;
-  
+
   /** x in micrometers. */
   private int x;
   /** y in micrometers. */
@@ -99,17 +99,17 @@ public final class MediaPrintableArea
   private int w;
   /** height in micrometers. */
   private int h;
-  
+
   /**
    * Creates a new <code>MediaPrintableArea</code> object with the given
    * float values for the given units.
-   * 
+   *
    * @param x start of the printable area on the sheet in x direction.
    * @param y start of the printable area on the sheet in y direction.
    * @param w the width of the printable area.
    * @param h the height of the printable area.
    * @param units the units of the given values.
-   * 
+   *
    * @throws IllegalArgumentException if x i&lt; 0 or y i&lt; 0 or w i&lt;= 0
    * or h i&lt;= 0 or units i&lt; 1
    */
@@ -127,13 +127,13 @@ public final class MediaPrintableArea
   /**
    * Creates a new <code>MediaPrintableArea</code> object with the given
    * int values for the given units.
-   * 
+   *
    * @param x start of the printable area on the sheet in x direction.
    * @param y start of the printable area on the sheet in y direction.
    * @param w the width of the printable area.
    * @param h the height of the printable area.
    * @param units the units of the given values.
-   * 
+   *
    * @throws IllegalArgumentException if x i&lt; 0 or y i&lt; 0 or w i&lt;= 0
    * or h i&lt;= 0 or units i&lt; 1
    */
@@ -170,10 +170,10 @@ public final class MediaPrintableArea
 
   /**
    * Returns the height of the printable area for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The height.
-   * 
+   *
    * @throws IllegalArgumentException if <code>units</code> is &lt; 1
    */
   public float getHeight(int units)
@@ -186,10 +186,10 @@ public final class MediaPrintableArea
 
   /**
    * Returns the width of the printable area for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The width.
-   * 
+   *
    * @throws IllegalArgumentException if <code>units</code> is &lt; 1
    */
   public float getWidth(int units)
@@ -201,12 +201,12 @@ public final class MediaPrintableArea
   }
 
   /**
-   * Returns the position in x direction of the printable area 
+   * Returns the position in x direction of the printable area
    * for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The position in x direction.
-   * 
+   *
    * @throws IllegalArgumentException if <code>units</code> is &lt; 1
    */
   public float getX(int units)
@@ -218,12 +218,12 @@ public final class MediaPrintableArea
   }
 
   /**
-   * Returns the position in y direction of the printable area 
+   * Returns the position in y direction of the printable area
    * for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The position in y direction.
-   * 
+   *
    * @throws IllegalArgumentException if <code>units</code> is &lt; 1
    */
   public float getY(int units)
@@ -233,7 +233,7 @@ public final class MediaPrintableArea
 
     return y / ((float)units);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
@@ -256,7 +256,7 @@ public final class MediaPrintableArea
    * Returns the string representation for this object in units of millimeters..
    * <p>
    * The returned string is in the form "(x,y)->(width,height)mm".
-   * </p> 
+   * </p>
    * @return The string representation in millimeters.
    */
   public String toString()
@@ -273,7 +273,7 @@ public final class MediaPrintableArea
   {
     return x ^ y + w ^ h;
   }
-  
+
   /**
    * Returns the string representation for this object in units of millimeters..
    * <p>
@@ -283,30 +283,30 @@ public final class MediaPrintableArea
    * @param unitsName the name of the used units, appended to the resulting
    * string if not <code>null</code>.
    * @return The string representation in millimeters.
-   * 
+   *
    * @throws IllegalArgumentException if <code>units</code> is &lt; 1
    */
   public String toString(int units, String unitsName)
   {
     if (units < 1)
       throw new IllegalArgumentException("units may not be less than 1");
-    
+
     String tmp = "(" + getX(units) + "," + getY(units) + ")->("
                  + getWidth(units) + "," + getHeight(units) + ")";
-    
+
     return unitsName == null ? tmp : tmp + unitsName;
   }
 
   /**
-   * Returns the printable area as an float[] with 4 values 
+   * Returns the printable area as an float[] with 4 values
    * (order x, y, width, height) in the given units.
-   * 
+   *
    * @param units the units to use.
    * @return The printable area as float array.
    */
   public float[] getPrintableArea(int units)
   {
-    return new float[] { getX(units), getY(units), 
+    return new float[] { getX(units), getY(units),
                          getWidth(units), getHeight(units) };
-  }  
+  }
 }
diff --git a/javax/print/attribute/standard/MediaSize.java b/javax/print/attribute/standard/MediaSize.java
index f2fa100a0..7df22cd4c 100644
--- a/javax/print/attribute/standard/MediaSize.java
+++ b/javax/print/attribute/standard/MediaSize.java
@@ -1,4 +1,4 @@
-/* MediaSize.java -- 
+/* MediaSize.java --
    Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,20 +45,20 @@ import javax.print.attribute.Size2DSyntax;
 
 /**
  * The <code>MediaSize</code> printing attribute class specifies the size
- * of a printing media. The size is defined in portrait orientation with 
+ * of a printing media. The size is defined in portrait orientation with
  * x at the bottom edge and y at the left edge.
  * <p>
  * There are several media sizes predefined through the nested classes. Further
  * sizes may be provided by the application. <code>MediaSize</code> is not used
- * as a printing attribute currently. It may be used to get the actual sizes 
+ * as a printing attribute currently. It may be used to get the actual sizes
  * for a named media or to find a suitable <code>MediaSizeName</code> instance
  * by querying with the needed sizes.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> MediaSize is not an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.MediaSizeName
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -66,9 +66,9 @@ public class MediaSize extends Size2DSyntax
   implements Attribute
 {
   private static final long serialVersionUID = -1967958664615414771L;
-  
+
   private static ArrayList<MediaSize> mediaCache;
-  
+
   static
     {
       mediaCache = new ArrayList<MediaSize>();
@@ -76,10 +76,10 @@ public class MediaSize extends Size2DSyntax
       // We call one instance of every container class to make sure it gets
       // loaded during class initialization and therefore all other static
       // fields of this container class also.
-      
+
       // This is needed to put all MediaSize instance into the mediaCache
       // for use by the static methods in this class.
-      
+
       MediaSize tmp = MediaSize.ISO.A0;
       tmp = MediaSize.JIS.B0;
       tmp = MediaSize.Engineering.A;
@@ -88,10 +88,10 @@ public class MediaSize extends Size2DSyntax
     }
 
   private MediaSizeName mediaName;
-  
+
   /**
-   * Creates a <code>MediaSize</code> object. The created object will be added 
-   * to an internal cache used in the static methods of this class for lookup 
+   * Creates a <code>MediaSize</code> object. The created object will be added
+   * to an internal cache used in the static methods of this class for lookup
    * of available <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
@@ -99,7 +99,7 @@ public class MediaSize extends Size2DSyntax
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -108,11 +108,11 @@ public class MediaSize extends Size2DSyntax
     super(x, y, units);
     mediaCache.add(this);
   }
-  
+
   /**
    * Creates a <code>MediaSize</code> object associated with the given
-   * media name. The created object will be added to an internal cache used 
-   * in the static methods of this class for lookup of available 
+   * media name. The created object will be added to an internal cache used
+   * in the static methods of this class for lookup of available
    * <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
@@ -121,7 +121,7 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -131,10 +131,10 @@ public class MediaSize extends Size2DSyntax
     mediaName = media;
     mediaCache.add(this);
   }
-  
+
   /**
-   * Creates a <code>MediaSize</code> object. The created object will be added 
-   * to an internal cache used in the static methods of this class for lookup 
+   * Creates a <code>MediaSize</code> object. The created object will be added
+   * to an internal cache used in the static methods of this class for lookup
    * of available <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
@@ -142,7 +142,7 @@ public class MediaSize extends Size2DSyntax
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -151,11 +151,11 @@ public class MediaSize extends Size2DSyntax
     super(x, y, units);
     mediaCache.add(this);
   }
-  
+
   /**
    * Creates a <code>MediaSize</code> object associated with the given
-   * media name. The created object will be added to an internal cache used 
-   * in the static methods of this class for lookup of available 
+   * media name. The created object will be added to an internal cache used
+   * in the static methods of this class for lookup of available
    * <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
@@ -164,7 +164,7 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -174,7 +174,7 @@ public class MediaSize extends Size2DSyntax
     mediaName = media;
     mediaCache.add(this);
   }
-  
+
   /**
    * Returns category of this class.
    *
@@ -185,13 +185,13 @@ public class MediaSize extends Size2DSyntax
     return MediaSize.class;
   }
 
-    
+
   /**
    * Searches for a MediaSize object with the given dimensions.
    * If none is found with exact dimensions, the closest match is used.
-   * Afterwards the MediaSizeName of the found MediaSize object is 
+   * Afterwards the MediaSizeName of the found MediaSize object is
    * returned - which might be null if none is specified.
-   * 
+   *
    * @param x the dimension for x
    * @param y the dimension for y
    * @param units the units to be used for comparison
@@ -202,7 +202,7 @@ public class MediaSize extends Size2DSyntax
     if (x <= 0.0f || y <= 0.0f)
       throw new IllegalArgumentException(
         "x and/or y may not be less or equal 0");
-  
+
     if (units < 1)
       throw new IllegalArgumentException("units may not be less then 1");
 
@@ -215,7 +215,7 @@ public class MediaSize extends Size2DSyntax
     for (int i = 0; i < mediaCache.size(); i++)
       {
         MediaSize size = mediaCache.get(i);
-        int dist = (Math.abs(size.getXMicrometers() - xMicro) 
+        int dist = (Math.abs(size.getXMicrometers() - xMicro)
                     + Math.abs(size.getYMicrometers() - yMicro));
 
         if (dist < bestDistance)
@@ -227,34 +227,34 @@ public class MediaSize extends Size2DSyntax
 
     return bestMatch.getMediaSizeName();
   }
-  
+
   /**
-   * Returns the associated <code>MediaSize</code> instance for the 
+   * Returns the associated <code>MediaSize</code> instance for the
    * given named media <code>MediaSizeName</code> instance.
-   * 
+   *
    * @param media the named media to search for.
-   * @return The corresponding <code>MediaSize</code> instance or 
+   * @return The corresponding <code>MediaSize</code> instance or
    * <code>null</code> if none found.
    */
   public static MediaSize getMediaSizeForName(MediaSizeName media)
   {
     for (int i = 0; i < mediaCache.size(); i++)
       {
-	MediaSize size = mediaCache.get(i);
-	
-	if (size.getMediaSizeName().equals(media))
-	  return size;
+        MediaSize size = mediaCache.get(i);
+
+        if (size.getMediaSizeName().equals(media))
+          return size;
       }
 
     return null;
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -266,10 +266,10 @@ public class MediaSize extends Size2DSyntax
     return (tmp.getXMicrometers() == this.getXMicrometers()
             && tmp.getYMicrometers() == this.getYMicrometers());
   }
-  
+
   /**
    * Returns the media name of this size.
-   * 
+   *
    * @return The media name.
    */
   public MediaSizeName getMediaSizeName()
@@ -289,28 +289,28 @@ public class MediaSize extends Size2DSyntax
 
   /**
    * Container class for predefined ISO media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class ISO 
+  public static final class ISO
   {
     private ISO()
     {
       // prevent instantiation
     }
-    
+
     /**
      * ISO A0 paper, 841 mm x 1189 mm.
      */
-    public static final MediaSize A0 = new MediaSize(841, 1189, 
-					       MediaSize.MM, 
-					       MediaSizeName.ISO_A0);
+    public static final MediaSize A0 = new MediaSize(841, 1189,
+                                               MediaSize.MM,
+                                               MediaSizeName.ISO_A0);
 
     /**
      * ISO A1 paper, 594 mm x 841 mm
      */
-    public static final MediaSize A1 = new MediaSize(594, 841, MediaSize.MM, 
-					       MediaSizeName.ISO_A1);
+    public static final MediaSize A1 = new MediaSize(594, 841, MediaSize.MM,
+                                               MediaSizeName.ISO_A1);
 
     /**
      * ISO A2 paper, 420 mm x 594 mm
@@ -412,7 +412,7 @@ public class MediaSize extends Size2DSyntax
      * ISO B10 paper, 31 mm x 44 mm
      */
     public static final MediaSize B10 = new MediaSize(31, 44, MediaSize.MM, MediaSizeName.ISO_B10);
-    
+
     /**
      * ISO C3 envelope, 324 mm x 458 mm
      */
@@ -436,13 +436,13 @@ public class MediaSize extends Size2DSyntax
     /**
      * ISO ISO Designated Long paper, 324 mm x 458 mm
      */
-    public static final MediaSize DESIGNATED_LONG = 
+    public static final MediaSize DESIGNATED_LONG =
       new MediaSize(324, 458, MediaSize.MM, MediaSizeName.ISO_DESIGNATED_LONG);
-  } 
+  }
 
   /**
    * Container class for predefined North American media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
   public static final class NA
@@ -451,170 +451,170 @@ public class MediaSize extends Size2DSyntax
     {
       // prevent instantiation
     }
-    
+
     /**
      * US Legal paper size, 8.5 inch x 14 inch
      */
-    public static final MediaSize LEGAL = new MediaSize(8.5f, 14f, MediaSize.INCH, 
-						  MediaSizeName.NA_LEGAL);
+    public static final MediaSize LEGAL = new MediaSize(8.5f, 14f, MediaSize.INCH,
+                                                  MediaSizeName.NA_LEGAL);
 
     /**
      * US Letter paper size, 8.5 inch x 11 inch
      */
     public static final MediaSize LETTER = new MediaSize(8.5f, 11f, MediaSize.INCH,
-						   MediaSizeName.NA_LETTER);
+                                                   MediaSizeName.NA_LETTER);
 
     /**
      * 5 inch x 7 inch paper size.
      */
     public static final MediaSize NA_5X7 = new MediaSize(5, 7, MediaSize.INCH,
-							 MediaSizeName.NA_5X7);
+                                                         MediaSizeName.NA_5X7);
 
     /**
      * 8 inch x 10 inch paper size.
      */
     public static final MediaSize NA_8X10 = new MediaSize(8, 10, MediaSize.INCH,
-							  MediaSizeName.NA_8X10);
+                                                          MediaSizeName.NA_8X10);
 
     /**
      * 6 inch x 9 inch envelope size.
      */
-    public static final MediaSize NA_6X9_ENVELOPE = new MediaSize(6f, 9f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_6X9_ENVELOPE);
+    public static final MediaSize NA_6X9_ENVELOPE = new MediaSize(6f, 9f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_6X9_ENVELOPE);
 
     /**
      * 7 inch x 9 inch envelope size.
      */
-    public static final MediaSize NA_7X9_ENVELOPE = new MediaSize(7f, 9f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_7X9_ENVELOPE);
+    public static final MediaSize NA_7X9_ENVELOPE = new MediaSize(7f, 9f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_7X9_ENVELOPE);
 
     /**
      * 9 inch x 11 inch envelope size.
      */
-    public static final MediaSize NA_9x11_ENVELOPE = new MediaSize(9f, 11f, 
-							     MediaSize.INCH,
-							     MediaSizeName.NA_9X11_ENVELOPE);
+    public static final MediaSize NA_9x11_ENVELOPE = new MediaSize(9f, 11f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.NA_9X11_ENVELOPE);
 
     /**
      * 9 inch x 12 inch envelope size.
      */
-    public static final MediaSize NA_9x12_ENVELOPE = new MediaSize(9f, 12f, 
-							     MediaSize.INCH,
-							     MediaSizeName.NA_9X12_ENVELOPE);
+    public static final MediaSize NA_9x12_ENVELOPE = new MediaSize(9f, 12f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.NA_9X12_ENVELOPE);
 
 
     /**
      * 10 inch x 13 inch envelope size.
      */
-    public static final MediaSize NA_10x13_ENVELOPE = new MediaSize(10f, 13f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X13_ENVELOPE);
+    public static final MediaSize NA_10x13_ENVELOPE = new MediaSize(10f, 13f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X13_ENVELOPE);
 
     /**
      * 10 inch x 14 inch envelope size.
      */
-    public static final MediaSize NA_10x14_ENVELOPE = new MediaSize(10f, 14f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X14_ENVELOPE);
+    public static final MediaSize NA_10x14_ENVELOPE = new MediaSize(10f, 14f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X14_ENVELOPE);
 
     /**
      * 10 inch x 15 inch envelope size.
      */
-    public static final MediaSize NA_10X15_ENVELOPE = new MediaSize(10f, 15f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X15_ENVELOPE);
+    public static final MediaSize NA_10X15_ENVELOPE = new MediaSize(10f, 15f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X15_ENVELOPE);
 
     /**
      * Number 9 envelope size. 4.5 inch x 10.375 inch
      */
     public static final MediaSize NA_NUMBER_9_ENVELOPE = new MediaSize(3.875f, 8.875f,
-								 MediaSize.INCH,
-								 MediaSizeName.NA_NUMBER_9_ENVELOPE);
+                                                                 MediaSize.INCH,
+                                                                 MediaSizeName.NA_NUMBER_9_ENVELOPE);
 
     /**
      * Number 10 envelope size. 4.125 inch x 9.5 inch
      */
-    public static final MediaSize NA_NUMBER_10_ENVELOPE = 
+    public static final MediaSize NA_NUMBER_10_ENVELOPE =
       new MediaSize(4.125f, 9.5f, MediaSize.INCH, MediaSizeName.NA_NUMBER_10_ENVELOPE);
 
     /**
      * Number 11 envelope size. 4.5 inch x 10.375 inch
      */
     public static final MediaSize NA_NUMBER_11_ENVELOPE = new MediaSize(4.5f, 10.375f, MediaSize.INCH,
-								  MediaSizeName.NA_NUMBER_11_ENVELOPE);
-    
+                                                                  MediaSizeName.NA_NUMBER_11_ENVELOPE);
+
     /**
      * Number 12 envelope size. 4.75 inch x 11 inch
      */
-    public static final MediaSize NA_NUMBER_12_ENVELOPE = new MediaSize(4.75f, 11f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_NUMBER_12_ENVELOPE);
+    public static final MediaSize NA_NUMBER_12_ENVELOPE = new MediaSize(4.75f, 11f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_NUMBER_12_ENVELOPE);
 
   /**
    * Number 14 envelope size. 5 inch x 11.5 inch
    */
-  public static final MediaSize NA_NUMBER_14_ENVELOPE = new MediaSize(5f, 11.5f, 
-								MediaSize.INCH,
-								MediaSizeName.NA_NUMBER_14_ENVELOPE);
+  public static final MediaSize NA_NUMBER_14_ENVELOPE = new MediaSize(5f, 11.5f,
+                                                                MediaSize.INCH,
+                                                                MediaSizeName.NA_NUMBER_14_ENVELOPE);
   }
 
   /**
    * Container class for predefined US Engineering media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class Engineering 
+  public static final class Engineering
   {
     private Engineering()
     {
       // prevent instantiation
     }
-    
+
     /**
      * ANSI A paper size. 8.5 inch x 11 inch
      */
-    public static final MediaSize A = new MediaSize(8.5f, 11f, 
-					      MediaSize.INCH, MediaSizeName.A);
+    public static final MediaSize A = new MediaSize(8.5f, 11f,
+                                              MediaSize.INCH, MediaSizeName.A);
 
     /**
      * ANSI B paper size. 11 inch x 17 inch
      */
-    public static final MediaSize B = new MediaSize(11f, 17f, 
-					      MediaSize.INCH, MediaSizeName.B);
+    public static final MediaSize B = new MediaSize(11f, 17f,
+                                              MediaSize.INCH, MediaSizeName.B);
 
     /**
      * ANSI C paper size. 17 inch x 22 inch
      */
-    public static final MediaSize C = new MediaSize(17f, 22f, 
-					      MediaSize.INCH, MediaSizeName.C);
+    public static final MediaSize C = new MediaSize(17f, 22f,
+                                              MediaSize.INCH, MediaSizeName.C);
 
     /**
      * ANSI D paper size. 22 inch x 34 inch
      */
-    public static final MediaSize D = new MediaSize(22f, 34f, 
-					      MediaSize.INCH, MediaSizeName.D);
+    public static final MediaSize D = new MediaSize(22f, 34f,
+                                              MediaSize.INCH, MediaSizeName.D);
 
     /**
      * ANSI E paper size. 33 inch x 44 inch
      */
-    public static final MediaSize E = new MediaSize(34f, 44f, 
-					      MediaSize.INCH, MediaSizeName.E);
+    public static final MediaSize E = new MediaSize(34f, 44f,
+                                              MediaSize.INCH, MediaSizeName.E);
   }
 
   /**
    * Container class for predefined Japanese JIS media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class JIS 
+  public static final class JIS
   {
     private JIS()
     {
       // prevent instantiation
     }
-    
+
     /**
      * JIS B0 paper. 1030 mm x 1456 mm
      * Note: The JIS B-series is not identical to the ISO B-series.
@@ -804,7 +804,7 @@ public class MediaSize extends Size2DSyntax
 
   /**
    * Container class for miscellaneous media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
   public static final class Other
@@ -813,12 +813,12 @@ public class MediaSize extends Size2DSyntax
     {
       // prevent instantiation
     }
-    
+
     /**
      * US Executive paper size, 7.25 inch x 10.5 inch
      */
-    public static final MediaSize EXECUTIVE = new MediaSize(7.25f, 10.5f, 
-						      MediaSize.INCH, MediaSizeName.EXECUTIVE);
+    public static final MediaSize EXECUTIVE = new MediaSize(7.25f, 10.5f,
+                                                      MediaSize.INCH, MediaSizeName.EXECUTIVE);
 
     /**
      * US Folio paper size, 8.5 inch x 13 inch
@@ -829,39 +829,39 @@ public class MediaSize extends Size2DSyntax
      * US Quarto paper size, 8.5 inches by 10.83 inches.
      */
     public static final MediaSize QUARTO = new MediaSize(8.5f, 10.83f, MediaSize.INCH,
-						   MediaSizeName.QUARTO);
+                                                   MediaSizeName.QUARTO);
 
     /**
      * US Invoice size, 5.5 inch x 8.5 inch
      */
-    public static final MediaSize INVOICE = new MediaSize(5.5f, 8.5f, 
-						    MediaSize.INCH, MediaSizeName.INVOICE);
+    public static final MediaSize INVOICE = new MediaSize(5.5f, 8.5f,
+                                                    MediaSize.INCH, MediaSizeName.INVOICE);
 
     /**
      * US Ledger size, 11 inch x 17 inch
      */
-    public static final MediaSize LEDGER = new MediaSize(11, 17, MediaSize.INCH, 
-						   MediaSizeName.LEDGER);
+    public static final MediaSize LEDGER = new MediaSize(11, 17, MediaSize.INCH,
+                                                   MediaSizeName.LEDGER);
 
     /**
      * Monarch (7 3/4) envelope size, 3.87 inch x 7.5 inch
      */
-    public static final MediaSize MONARCH_ENVELOPE = new MediaSize(3.87f, 7.5f, 
-							     MediaSize.INCH,
-							     MediaSizeName.MONARCH_ENVELOPE);
+    public static final MediaSize MONARCH_ENVELOPE = new MediaSize(3.87f, 7.5f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.MONARCH_ENVELOPE);
 
     /**
      * Personal envelope size, 3.625 inch x 6.5 inch.
      */
     public static final MediaSize PERSONAL_ENVELOPE = new MediaSize(3.625f, 6.5f, MediaSize.INCH,
-							      MediaSizeName.PERSONAL_ENVELOPE);
+                                                              MediaSizeName.PERSONAL_ENVELOPE);
 
     /**
      * Italian envelope size, 110 mm x 230 mm
      */
-    public static final MediaSize ITALY_ENVELOPE = new MediaSize(110, 230, 
-							   MediaSize.MM,
-							   MediaSizeName.ITALY_ENVELOPE);
+    public static final MediaSize ITALY_ENVELOPE = new MediaSize(110, 230,
+                                                           MediaSize.MM,
+                                                           MediaSizeName.ITALY_ENVELOPE);
 
     /**
      * Japanese postcard, 100 mm x 148 mm
@@ -872,13 +872,12 @@ public class MediaSize extends Size2DSyntax
      * Japanese double postcard, 148 mm x 200 mm
      */
     public static final MediaSize JAPANESE_DOUBLE_POSTCARD = new MediaSize(148, 200, MediaSize.MM, MediaSizeName.JAPANESE_DOUBLE_POSTCARD);
-    
+
     /**
      * Tabloid size, 11 inch x 17 inch.
      * @since 1.5
      */
-    public static final MediaSize TABLOID = 
+    public static final MediaSize TABLOID =
       new MediaSize(11, 17, Size2DSyntax.INCH, MediaSizeName.TABLOID);
   }
 }
-
diff --git a/javax/print/attribute/standard/MediaSizeName.java b/javax/print/attribute/standard/MediaSizeName.java
index e29b1ae34..a6b26b1d5 100644
--- a/javax/print/attribute/standard/MediaSizeName.java
+++ b/javax/print/attribute/standard/MediaSizeName.java
@@ -40,16 +40,16 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * <code>MediaSizeName</code> is a subclass of the <code>Media</code> printing 
- * attribute and provides selection of media to be used by the means of 
- * defined size names. The class pre-defines commonly available media sizes. 
- * This media type enumeration may be used in alternative to 
+ * <code>MediaSizeName</code> is a subclass of the <code>Media</code> printing
+ * attribute and provides selection of media to be used by the means of
+ * defined size names. The class pre-defines commonly available media sizes.
+ * This media type enumeration may be used in alternative to
  * MediaName/MediaTray.
  * <p>
- * <b>IPP Compatibility:</b> MediaSizeName is not an IPP 1.1 attribute on its 
+ * <b>IPP Compatibility:</b> MediaSizeName is not an IPP 1.1 attribute on its
  * own. It provides parts of the <code>media</code> attribute type values.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -61,412 +61,412 @@ public class MediaSizeName extends Media
    * The ISO A0 size: 841 mm by 1189 mm.
    */
   public static final MediaSizeName ISO_A0 = new MediaSizeName(0);
-  
+
   /**
    * The ISO A1 size: 594 mm by 841 mm.
    */
   public static final MediaSizeName ISO_A1 = new MediaSizeName(1);
-  
+
   /**
    * The ISO A2 size: 420 mm by 594 mm.
    */
   public static final MediaSizeName ISO_A2 = new MediaSizeName(2);
-  
+
   /**
    * The ISO A3 size: 297 mm by 420 mm.
    */
   public static final MediaSizeName ISO_A3 = new MediaSizeName(3);
-  
+
   /**
    * The ISO A4 size: 210 mm by 297 mm.
    */
   public static final MediaSizeName ISO_A4 = new MediaSizeName(4);
-  
+
   /**
    * The ISO A5 size: 148 mm by 210 mm.
    */
   public static final MediaSizeName ISO_A5 = new MediaSizeName(5);
-  
+
   /**
    * The ISO A6 size: 105 mm by 148 mm.
    */
   public static final MediaSizeName ISO_A6 = new MediaSizeName(6);
-  
+
   /**
    * The ISO A7 size: 74 mm by 105 mm.
    */
   public static final MediaSizeName ISO_A7 = new MediaSizeName(7);
-  
+
   /**
    * The ISO A8 size: 52 mm by 74 mm.
    */
   public static final MediaSizeName ISO_A8 = new MediaSizeName(8);
-  
+
   /**
    * The ISO A9 size: 37 mm by 52 mm.
    */
   public static final MediaSizeName ISO_A9 = new MediaSizeName(9);
-  
+
   /**
    * The ISO A10 size: 26 mm by 37 mm.
    */
   public static final MediaSizeName ISO_A10 = new MediaSizeName(10);
-  
+
   /**
    * The ISO B0 size: 1000 mm by 1414 mm.
    */
   public static final MediaSizeName ISO_B0 = new MediaSizeName(11);
-  
+
   /**
    * The ISO B1 size: 707 mm by 1000 mm.
    */
   public static final MediaSizeName ISO_B1 = new MediaSizeName(12);
-  
+
   /**
    * The ISO B2 size: 500 mm by 707 mm.
    */
   public static final MediaSizeName ISO_B2 = new MediaSizeName(13);
-  
+
   /**
    * The ISO B3 size: 353 mm by 500 mm.
    */
   public static final MediaSizeName ISO_B3 = new MediaSizeName(14);
-  
+
   /**
    * The ISO B4 size: 250 mm by 353 mm.
    */
   public static final MediaSizeName ISO_B4 = new MediaSizeName(15);
-  
+
   /**
    * The ISO B5 size: 176 mm by 250 mm.
    */
   public static final MediaSizeName ISO_B5 = new MediaSizeName(16);
-  
+
   /**
    * The ISO B6 size: 125 mm by 176 mm.
    */
   public static final MediaSizeName ISO_B6 = new MediaSizeName(17);
-  
+
   /**
    * The ISO B7 size: 88 mm by 125 mm.
    */
   public static final MediaSizeName ISO_B7 = new MediaSizeName(18);
-  
+
   /**
    * The ISO B8 size: 62 mm by 88 mm.
    */
   public static final MediaSizeName ISO_B8 = new MediaSizeName(19);
-  
+
   /**
    * The ISO B9 size: 44 mm by 62 mm.
    */
   public static final MediaSizeName ISO_B9 = new MediaSizeName(20);
-  
+
   /**
    * The ISO B10 size: 31 mm by 44 mm.
    */
   public static final MediaSizeName ISO_B10 = new MediaSizeName(21);
-  
+
   /**
    * The JIS B0 size: 1030mm x 1456mm.
    */
   public static final MediaSizeName JIS_B0 = new MediaSizeName(22);
-  
+
   /**
    * The JIS B1 size: 728mm x 1030mm.
    */
   public static final MediaSizeName JIS_B1 = new MediaSizeName(23);
-  
+
   /**
    * The JIS B2 size: 515mm x 728mm.
    */
   public static final MediaSizeName JIS_B2 = new MediaSizeName(24);
-  
+
   /**
    * The JIS B3 size: 364mm x 515mm.
    */
   public static final MediaSizeName JIS_B3 = new MediaSizeName(25);
-  
+
   /**
    * The JIS B4 size: 257mm x 364mm.
    */
   public static final MediaSizeName JIS_B4 = new MediaSizeName(26);
-  
+
   /**
    * The JIS B5 size: 182mm x 257mm.
    */
   public static final MediaSizeName JIS_B5 = new MediaSizeName(27);
-  
+
   /**
    * The JIS B6 size: 128mm x 182mm.
    */
   public static final MediaSizeName JIS_B6 = new MediaSizeName(28);
-  
+
   /**
    * The JIS B7 size: 91mm x 128mm.
    */
   public static final MediaSizeName JIS_B7 = new MediaSizeName(29);
-  
+
   /**
    * The JIS B8 size: 64mm x 91mm.
    */
   public static final MediaSizeName JIS_B8 = new MediaSizeName(30);
-  
+
   /**
    * The JIS B9 size: 45mm x 64mm.
    */
   public static final MediaSizeName JIS_B9 = new MediaSizeName(31);
-  
+
   /**
    * The JIS B10 size: 32mm x 45mm.
    */
   public static final MediaSizeName JIS_B10 = new MediaSizeName(32);
-  
+
   /**
    * The ISO C0 size: 917 mm by 1297 mm.
    */
   public static final MediaSizeName ISO_C0 = new MediaSizeName(33);
-  
+
   /**
    * The ISO C1 size: 648 mm by 917 mm.
    */
   public static final MediaSizeName ISO_C1 = new MediaSizeName(34);
-  
+
   /**
    * The ISO C2 size: 458 mm by 648 mm.
    */
   public static final MediaSizeName ISO_C2 = new MediaSizeName(35);
-  
+
   /**
    * The ISO C3 size: 324 mm by 458 mm.
    */
   public static final MediaSizeName ISO_C3 = new MediaSizeName(36);
-  
+
   /**
    * The ISO C4 size: 229 mm by 324 mm.
    */
   public static final MediaSizeName ISO_C4 = new MediaSizeName(37);
-  
+
   /**
    * The ISO C5 size: 162 mm by 229 mm.
    */
   public static final MediaSizeName ISO_C5 = new MediaSizeName(38);
-  
+
   /**
    * The ISO C6 size: 114 mm by 162 mm.
    */
   public static final MediaSizeName ISO_C6 = new MediaSizeName(39);
-  
+
   /**
    * The North American letter size: 8.5 inches by 11 inches.
    */
   public static final MediaSizeName NA_LETTER = new MediaSizeName(40);
-  
+
   /**
    * The North American legal size: 8.5 inches by 14 inches.
    */
   public static final MediaSizeName NA_LEGAL = new MediaSizeName(41);
-  
+
   /**
    * The executive size: 7.25 inches by 10.5 inches.
    */
   public static final MediaSizeName EXECUTIVE = new MediaSizeName(42);
-  
+
   /**
    * The ledger size: 11 inches by 17 inches.
    */
   public static final MediaSizeName LEDGER = new MediaSizeName(43);
-  
+
   /**
    * The tabloid size: 11 inches by 17 inches.
    */
   public static final MediaSizeName TABLOID = new MediaSizeName(44);
-  
+
   /**
    * The invoice size: 5.5 inches by 8.5 inches.
    */
   public static final MediaSizeName INVOICE = new MediaSizeName(45);
-  
+
   /**
    * The folio size: 8.5 inches by 13 inches.
    */
   public static final MediaSizeName FOLIO = new MediaSizeName(46);
-  
+
   /**
    * The quarto size: 8.5 inches by 10.83 inches.
    */
   public static final MediaSizeName QUARTO = new MediaSizeName(47);
-  
+
   /**
    * The Japanese postcard size, 100 mm by 148 mm.
    */
   public static final MediaSizeName JAPANESE_POSTCARD = new MediaSizeName(48);
-  
+
   /**
    * The Japanese Double postcard size: 148 mm by 200 mm.
    */
   public static final MediaSizeName JAPANESE_DOUBLE_POSTCARD =
     new MediaSizeName(49);
-  
+
   /**
    * The engineering ANSI A size medium: 8.5 inches x 11 inches.
    */
   public static final MediaSizeName A = new MediaSizeName(50);
-  
+
   /**
    * The engineering ANSI B size medium: 11 inches x 17 inches.
    */
   public static final MediaSizeName B = new MediaSizeName(51);
-  
+
   /**
    * The engineering ANSI C size medium: 17 inches x 22 inches.
    */
   public static final MediaSizeName C = new MediaSizeName(52);
-  
+
   /**
    * The engineering ANSI D size medium: 22 inches x 34 inches.
    */
   public static final MediaSizeName D = new MediaSizeName(53);
-  
+
   /**
    * The engineering ANSI E size medium: 34 inches x 44 inches.
    */
   public static final MediaSizeName E = new MediaSizeName(54);
-  
+
   /**
    * The ISO Designated Long size: 110 mm by 220 mm.
    */
   public static final MediaSizeName ISO_DESIGNATED_LONG =
     new MediaSizeName(55);
-  
+
   /**
    * The Italy envelope size: 110 mm by 230 mm.
    */
   public static final MediaSizeName ITALY_ENVELOPE = new MediaSizeName(56);
-  
+
   /**
    * The Monarch envelope size: 3.87 inch by 7.5 inch.
    */
   public static final MediaSizeName MONARCH_ENVELOPE = new MediaSizeName(57);
-  
+
   /**
    * The Personal envelope size: 3.625 inch by 6.5 inch.
    */
   public static final MediaSizeName PERSONAL_ENVELOPE = new MediaSizeName(58);
-  
+
   /**
-   * The North American number 9 business envelope size: 
+   * The North American number 9 business envelope size:
    * 3.875 inches by 8.875 inches.
    */
   public static final MediaSizeName NA_NUMBER_9_ENVELOPE =
     new MediaSizeName(59);
-  
+
   /**
-   * The North American number 10 business envelope size:  
+   * The North American number 10 business envelope size:
    * 4.125 inches by 9.5 inches.
    */
   public static final MediaSizeName NA_NUMBER_10_ENVELOPE =
     new MediaSizeName(60);
-  
+
   /**
-   * The North American number 11 business envelope size: 
+   * The North American number 11 business envelope size:
    * 4.5 inches by 10.375 inches.
    */
   public static final MediaSizeName NA_NUMBER_11_ENVELOPE =
     new MediaSizeName(61);
-  
+
   /**
-   * The North American number 12 business envelope size: 
+   * The North American number 12 business envelope size:
    * 4.75 inches by 11 inches.
    */
   public static final MediaSizeName NA_NUMBER_12_ENVELOPE =
     new MediaSizeName(62);
-  
+
   /**
-   * The North American number 14 business envelope size: 
+   * The North American number 14 business envelope size:
    * 5 inches by 11.5 inches.
    */
   public static final MediaSizeName NA_NUMBER_14_ENVELOPE =
     new MediaSizeName(63);
-  
+
   /**
    * The North American 6x9 inch envelope size.
    */
   public static final MediaSizeName NA_6X9_ENVELOPE = new MediaSizeName(64);
-  
+
   /**
    * The North American 7x9 inch envelope size.
    */
   public static final MediaSizeName NA_7X9_ENVELOPE = new MediaSizeName(65);
-  
+
   /**
    * The North American 9x11 inch envelope size.
    */
   public static final MediaSizeName NA_9X11_ENVELOPE = new MediaSizeName(66);
-  
+
   /**
    * The North American 9x12 inch envelope size.
    */
   public static final MediaSizeName NA_9X12_ENVELOPE = new MediaSizeName(67);
-  
+
   /**
    * The North American 10x13 inch envelope size.
    */
   public static final MediaSizeName NA_10X13_ENVELOPE = new MediaSizeName(68);
-  
+
   /**
    * The North American 10x14 inch envelope size.
    */
   public static final MediaSizeName NA_10X14_ENVELOPE = new MediaSizeName(69);
-  
+
   /**
    * The North American 10x15 inch envelope size.
    */
   public static final MediaSizeName NA_10X15_ENVELOPE = new MediaSizeName(70);
-  
+
   /**
    * The North American 5 inches by 7 inches.
    */
   public static final MediaSizeName NA_5X7 = new MediaSizeName(71);
-  
+
   /**
    * The North American 8 inches by 10 inches.
    */
   public static final MediaSizeName NA_8X10 = new MediaSizeName(72);
 
-  private static final String[] stringTable = 
-    { "iso-a0",  "iso-a1", "iso-a2", "iso-a3", "iso-a4", "iso-a5", "iso-a6", 
-      "iso-a7", "iso-a8", "iso-a9", "iso-a10", "iso-b0", "iso-b1", "iso-b2", 
-      "iso-b3", "iso-b4", "iso-b5", "iso-b6", "iso-b7", "iso-b8", "iso-b9", 
-      "iso-b10", "jis-b0", "jis-b1", "jis-b2", "jis-b3", "jis-b4", "jis-b5", 
-      "jis-b6", "jis-b7", "jis-b8", "jis-b9", "jis-b10", "iso-c0", "iso-c1", 
-      "iso-c2", "iso-c3", "iso-c4", "iso-c5", "iso-c6", "na-letter", 
-      "na-legal", "executive", "ledger", "tabloid", "invoice", "folio", 
-      "quarto", "japanese-postcard", "oufuko-postcard", "a", "b", "c", "d", 
-      "e", "iso-designated-long", "italian-envelope", "monarch-envelope", 
-      "personal-envelope", "na-number-9-envelope", "na-number-10-envelope", 
-      "na-number-11-envelope", "na-number-12-envelope", 
-      "na-number-14-envelope", "na-6x9-envelope", "na-7x9-envelope", 
-      "na-9x11-envelope", "na-9x12-envelope", "na-10x13-envelope", 
+  private static final String[] stringTable =
+    { "iso-a0",  "iso-a1", "iso-a2", "iso-a3", "iso-a4", "iso-a5", "iso-a6",
+      "iso-a7", "iso-a8", "iso-a9", "iso-a10", "iso-b0", "iso-b1", "iso-b2",
+      "iso-b3", "iso-b4", "iso-b5", "iso-b6", "iso-b7", "iso-b8", "iso-b9",
+      "iso-b10", "jis-b0", "jis-b1", "jis-b2", "jis-b3", "jis-b4", "jis-b5",
+      "jis-b6", "jis-b7", "jis-b8", "jis-b9", "jis-b10", "iso-c0", "iso-c1",
+      "iso-c2", "iso-c3", "iso-c4", "iso-c5", "iso-c6", "na-letter",
+      "na-legal", "executive", "ledger", "tabloid", "invoice", "folio",
+      "quarto", "japanese-postcard", "oufuko-postcard", "a", "b", "c", "d",
+      "e", "iso-designated-long", "italian-envelope", "monarch-envelope",
+      "personal-envelope", "na-number-9-envelope", "na-number-10-envelope",
+      "na-number-11-envelope", "na-number-12-envelope",
+      "na-number-14-envelope", "na-6x9-envelope", "na-7x9-envelope",
+      "na-9x11-envelope", "na-9x12-envelope", "na-10x13-envelope",
       "na-10x14-envelope", "na-10x15-envelope", "na-5x7", "na-8x10" };
-  
-  private static final MediaSizeName[] enumValueTable = 
-    { ISO_A0, ISO_A1, ISO_A2, ISO_A3, ISO_A4, ISO_A5, ISO_A6, ISO_A7, ISO_A8, 
+
+  private static final MediaSizeName[] enumValueTable =
+    { ISO_A0, ISO_A1, ISO_A2, ISO_A3, ISO_A4, ISO_A5, ISO_A6, ISO_A7, ISO_A8,
       ISO_A9, ISO_A10, ISO_B0, ISO_B1, ISO_B2, ISO_B3, ISO_B4, ISO_B5, ISO_B6,
-      ISO_B7, ISO_B8, ISO_B9, ISO_B10, JIS_B0, JIS_B1, JIS_B2, JIS_B3, JIS_B4, 
+      ISO_B7, ISO_B8, ISO_B9, ISO_B10, JIS_B0, JIS_B1, JIS_B2, JIS_B3, JIS_B4,
       JIS_B5, JIS_B6, JIS_B7, JIS_B8, JIS_B9, JIS_B10, ISO_C0, ISO_C1, ISO_C2,
-      ISO_C3, ISO_C4, ISO_C5, ISO_C6, NA_LETTER, NA_LEGAL, EXECUTIVE, LEDGER, 
-      TABLOID, INVOICE, FOLIO, QUARTO, JAPANESE_POSTCARD, 
-      JAPANESE_DOUBLE_POSTCARD, A, B, C, D, E, ISO_DESIGNATED_LONG, 
-      ITALY_ENVELOPE, MONARCH_ENVELOPE, PERSONAL_ENVELOPE, 
+      ISO_C3, ISO_C4, ISO_C5, ISO_C6, NA_LETTER, NA_LEGAL, EXECUTIVE, LEDGER,
+      TABLOID, INVOICE, FOLIO, QUARTO, JAPANESE_POSTCARD,
+      JAPANESE_DOUBLE_POSTCARD, A, B, C, D, E, ISO_DESIGNATED_LONG,
+      ITALY_ENVELOPE, MONARCH_ENVELOPE, PERSONAL_ENVELOPE,
       NA_NUMBER_9_ENVELOPE, NA_NUMBER_10_ENVELOPE, NA_NUMBER_11_ENVELOPE,
       NA_NUMBER_12_ENVELOPE, NA_NUMBER_14_ENVELOPE, NA_6X9_ENVELOPE,
       NA_7X9_ENVELOPE, NA_9X11_ENVELOPE, NA_9X12_ENVELOPE, NA_10X13_ENVELOPE,
-      NA_10X14_ENVELOPE, NA_10X15_ENVELOPE, NA_5X7, NA_8X10 }; 
-  
+      NA_10X14_ENVELOPE, NA_10X15_ENVELOPE, NA_5X7, NA_8X10 };
+
   /**
    * Constructs a <code>MediaSizeName</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected MediaSizeName(int value)
diff --git a/javax/print/attribute/standard/MediaTray.java b/javax/print/attribute/standard/MediaTray.java
index 23811a0a4..836640c81 100644
--- a/javax/print/attribute/standard/MediaTray.java
+++ b/javax/print/attribute/standard/MediaTray.java
@@ -40,7 +40,7 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * <code>MediaTray</code> is a subclass of the <code>Media</code> printing 
+ * <code>MediaTray</code> is a subclass of the <code>Media</code> printing
  * attribute and provides selection of media to be used by the means of the
  * input tray of the printer. The class pre-defines commonly available types
  * of input trays in printers. This media type enumeration may be used in
@@ -49,25 +49,25 @@ import javax.print.attribute.EnumSyntax;
  * <b>IPP Compatibility:</b> MediaTray is not an IPP 1.1 attribute on its own.
  * It provides parts of the <code>media</code> attribute type values.
  * </p>
- * 
+ *
  * @author Sven de Marothy
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class MediaTray extends Media
 {
-  
+
   private static final long serialVersionUID = -982503611095214703L;
-  
+
   /**
    * Top tray
    */
   public static final MediaTray TOP = new MediaTray(0);
-  
+
   /**
    * Middle tray
    */
   public static final MediaTray MIDDLE = new MediaTray(1);
-  
+
   /**
    * Bottom tray
    */
@@ -80,9 +80,9 @@ public class MediaTray extends Media
 
   /**
    * Manual-feed tray
-   */ 
+   */
   public static final MediaTray MANUAL = new MediaTray(4);
-  
+
   /**
    * Large capacity tray
    */
@@ -92,22 +92,22 @@ public class MediaTray extends Media
    * Main tray
    */
   public static final MediaTray MAIN = new MediaTray(6);
-  
+
   /**
    * Side tray
    */
-  public static final MediaTray SIDE = new MediaTray(7);  
-  
+  public static final MediaTray SIDE = new MediaTray(7);
+
   private static final String[] stringTable = { "top", "middle", "bottom",
-                                                "envelope", "manual", 
-                                                "large-capacity", "main", 
+                                                "envelope", "manual",
+                                                "large-capacity", "main",
                                                 "side" };
-  
-  private static final MediaTray[] enumValueTable = { TOP, MIDDLE, BOTTOM, 
+
+  private static final MediaTray[] enumValueTable = { TOP, MIDDLE, BOTTOM,
                                                       ENVELOPE, MANUAL,
                                                       LARGE_CAPACITY, MAIN,
-                                                      SIDE };  
-  
+                                                      SIDE };
+
   /**
    * Creates a <code>MediaTray</code> object.
    *
@@ -117,7 +117,7 @@ public class MediaTray extends Media
   {
     super( i );
   }
- 
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -139,4 +139,3 @@ public class MediaTray extends Media
     return enumValueTable;
   }
 }
-
diff --git a/javax/print/attribute/standard/MultipleDocumentHandling.java b/javax/print/attribute/standard/MultipleDocumentHandling.java
index 3ee1b4126..feb01ea4c 100644
--- a/javax/print/attribute/standard/MultipleDocumentHandling.java
+++ b/javax/print/attribute/standard/MultipleDocumentHandling.java
@@ -45,13 +45,13 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The <code>MultipleDocumentHandling</code> printing attribute controls
- * how certain printing attributes affect printing in case of multiple 
- * documents in a print job. This attribute is only relevant if a job 
+ * how certain printing attributes affect printing in case of multiple
+ * documents in a print job. This attribute is only relevant if a job
  * has multiple documents.
  * <p>
  * <b>IPP Compatibility:</b> MultipleDocumentHandling is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -60,43 +60,43 @@ public class MultipleDocumentHandling extends EnumSyntax
 {
   private static final long serialVersionUID = 8098326460746413466L;
 
-  /** 
+  /**
    * Multiple documents are treated as a single document.
    */
   public static final MultipleDocumentHandling SINGLE_DOCUMENT =
     new MultipleDocumentHandling(0);
-  
-  /** 
+
+  /**
    * Multiple documents are treated as uncollated copies.
    */
   public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_UNCOLLATED_COPIES =
     new MultipleDocumentHandling(1);
-  
-  /** 
-   * Multiple documents are treated as collated copies. 
+
+  /**
+   * Multiple documents are treated as collated copies.
    */
   public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_COLLATED_COPIES =
     new MultipleDocumentHandling(2);
-  
-  /** 
+
+  /**
    * Multiple documents are treated so that every single document starts
-   * with a new sheet. 
+   * with a new sheet.
    */
   public static final MultipleDocumentHandling SINGLE_DOCUMENT_NEW_SHEET =
     new MultipleDocumentHandling(3);
-  
-  private static final String[] stringTable = { "single-document", 
+
+  private static final String[] stringTable = { "single-document",
                                                 "separate-documents-uncollated-copies",
                                                 "separate-documents-collated-copies",
                                                 "single-document-new-sheet" };
-  
-  private static final MultipleDocumentHandling[] enumValueTable = 
+
+  private static final MultipleDocumentHandling[] enumValueTable =
     { SINGLE_DOCUMENT, SEPARATE_DOCUMENTS_UNCOLLATED_COPIES,
       SEPARATE_DOCUMENTS_COLLATED_COPIES, SINGLE_DOCUMENT_NEW_SHEET};
 
   /**
    * Constructs a <code>MultipleDocumentHandling</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected MultipleDocumentHandling(int value)
@@ -123,7 +123,7 @@ public class MultipleDocumentHandling extends EnumSyntax
   {
     return "multiple-document-handling";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/NumberOfDocuments.java b/javax/print/attribute/standard/NumberOfDocuments.java
index 1121a1f0f..217df0d87 100644
--- a/javax/print/attribute/standard/NumberOfDocuments.java
+++ b/javax/print/attribute/standard/NumberOfDocuments.java
@@ -1,4 +1,4 @@
-/* NumberOfDocuments.java -- 
+/* NumberOfDocuments.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,7 +42,7 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The <code>NumberOfDocuments</code> printing attribute specifies 
+ * The <code>NumberOfDocuments</code> printing attribute specifies
  * the number of documents in a job.
  * <p>
  * <b>IPP Compatibility:</b> NumberOfDocuments is an IPP 1.1 attribute.
@@ -54,7 +54,7 @@ public final class NumberOfDocuments extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 7891881310684461097L;
-  
+
   /**
    * Creates a <code>NumberOfDocuments</code> object.
    *
@@ -69,13 +69,13 @@ public final class NumberOfDocuments extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/NumberOfInterveningJobs.java b/javax/print/attribute/standard/NumberOfInterveningJobs.java
index b968f9a7b..d33d826c8 100644
--- a/javax/print/attribute/standard/NumberOfInterveningJobs.java
+++ b/javax/print/attribute/standard/NumberOfInterveningJobs.java
@@ -1,4 +1,4 @@
-/* NumberOfInterveningJobs.java -- 
+/* NumberOfInterveningJobs.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,19 +43,19 @@ import javax.print.attribute.PrintJobAttribute;
 
 /**
  * The <code>NumberOfInterveningJobs</code> printing attribute provides
- * the number of jobs ahead in the print service queue before the 
+ * the number of jobs ahead in the print service queue before the
  * requested job.
  * <p>
  * <b>IPP Compatibility:</b> NumberOfInterveningJobs is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch
  */
 public final class NumberOfInterveningJobs extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 2568141124844982746L;
-  
+
   /**
    * Creates a <code>NumberOfInterveningJobs</code> object.
    *
@@ -70,13 +70,13 @@ public final class NumberOfInterveningJobs extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/NumberUp.java b/javax/print/attribute/standard/NumberUp.java
index 219a1c1a8..82779070e 100644
--- a/javax/print/attribute/standard/NumberUp.java
+++ b/javax/print/attribute/standard/NumberUp.java
@@ -1,4 +1,4 @@
-/* NumberUp.java -- 
+/* NumberUp.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,24 +44,24 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
 /**
- * The <code>NumberUp</code> printing attribute specifies the number of pages 
+ * The <code>NumberUp</code> printing attribute specifies the number of pages
  * to be arranged upon a single media sheet.
  * <p>
- * <b>Note:</b> The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * <b>Note:</b> The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> NumberUp is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch
  */
 public final class NumberUp extends IntegerSyntax
   implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -3040436486786527811L;
-  
+
   /**
    * Creates a <code>NumberUp</code> object.
    *
@@ -74,13 +74,13 @@ public final class NumberUp extends IntegerSyntax
   {
     super(value);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/NumberUpSupported.java b/javax/print/attribute/standard/NumberUpSupported.java
index 20bd9c93b..62f417b89 100644
--- a/javax/print/attribute/standard/NumberUpSupported.java
+++ b/javax/print/attribute/standard/NumberUpSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The <code>NumberUpSupported</code> printing attribute specifies the 
- * supported value or range of values for the 
+ * The <code>NumberUpSupported</code> printing attribute specifies the
+ * supported value or range of values for the
  * {@link javax.print.attribute.standard.NumberUp} attribute.
  * <p>
  * <b>IPP Compatibility:</b> NumberUpSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -68,7 +68,7 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
   public NumberUpSupported(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
@@ -79,13 +79,13 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
    * @param members the members supported for number up.
    *
    * @exception IllegalArgumentException if any element is invalid
-   * @exception NullPointerException if members is <code>null</code> or any 
+   * @exception NullPointerException if members is <code>null</code> or any
    * element of members is <code>null</code>.
    */
   public NumberUpSupported(int[][] members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
@@ -103,24 +103,24 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
   public NumberUpSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof NumberUpSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/OrientationRequested.java b/javax/print/attribute/standard/OrientationRequested.java
index 8d3468556..c24fab458 100644
--- a/javax/print/attribute/standard/OrientationRequested.java
+++ b/javax/print/attribute/standard/OrientationRequested.java
@@ -56,7 +56,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * <b>IPP Compatibility:</b> OrientationRequested is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,42 +65,42 @@ public final class OrientationRequested extends EnumSyntax
 {
   private static final long serialVersionUID = -4447437289862822276L;
 
-  /** 
-   * Orientation as portrait. 
+  /**
+   * Orientation as portrait.
    */
   public static final OrientationRequested PORTRAIT =
     new OrientationRequested(3);
-  
-  /** 
-   * Orientation as landscape. 
+
+  /**
+   * Orientation as landscape.
    */
   public static final OrientationRequested LANDSCAPE =
     new OrientationRequested(4);
-  
-  /** 
-   * Orientation as reversed landscape. 
+
+  /**
+   * Orientation as reversed landscape.
    */
   public static final OrientationRequested REVERSE_LANDSCAPE =
     new OrientationRequested(5);
-  
-  /** 
-   * Orientation as reversed portrait. 
+
+  /**
+   * Orientation as reversed portrait.
    */
   public static final OrientationRequested REVERSE_PORTRAIT =
     new OrientationRequested(6);
-  
+
 
   private static final String[] stringTable = { "portrait", "landscape",
                                                 "reverse-landscape",
                                                 "reverse-portrait" };
-  
-  private static final OrientationRequested[] 
-      enumValueTable = { PORTRAIT, LANDSCAPE, 
+
+  private static final OrientationRequested[]
+      enumValueTable = { PORTRAIT, LANDSCAPE,
                          REVERSE_LANDSCAPE, REVERSE_PORTRAIT };
 
   /**
    * Constructs a <code>OrientationRequested</code> object.
-   * 
+   *
    * @param value the value
    */
   protected OrientationRequested(int value)
@@ -127,7 +127,7 @@ public final class OrientationRequested extends EnumSyntax
   {
     return "orientation-requested";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -148,7 +148,7 @@ public final class OrientationRequested extends EnumSyntax
   {
     return enumValueTable;
   }
-  
+
   /**
    * Returns the lowest used value by the enumerations of this class.
    * .
@@ -157,5 +157,5 @@ public final class OrientationRequested extends EnumSyntax
   protected int getOffset()
   {
     return 3;
-  }  
+  }
 }
diff --git a/javax/print/attribute/standard/OutputDeviceAssigned.java b/javax/print/attribute/standard/OutputDeviceAssigned.java
index df8a5453f..769cef1e8 100644
--- a/javax/print/attribute/standard/OutputDeviceAssigned.java
+++ b/javax/print/attribute/standard/OutputDeviceAssigned.java
@@ -1,4 +1,4 @@
-/* OutputDeviceAssigned.java -- 
+/* OutputDeviceAssigned.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,17 +46,17 @@ import javax.print.attribute.TextSyntax;
 
 /**
  * The <code>OutputDeviceAssigned</code> printing attribute specifies the
- * output printer device assigned by a print service to a print job. 
+ * output printer device assigned by a print service to a print job.
  * <p>
  * This may be empty if a print service is embedded in a printer, e.g. is the
- * output device. However there exist print services with several physical 
+ * output device. However there exist print services with several physical
  * output devices (e.g. CUPS classes) where this attribute provides the actual
  * output device.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> OutputDeviceAssigned is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class OutputDeviceAssigned extends TextSyntax
@@ -83,7 +83,7 @@ public final class OutputDeviceAssigned extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PDLOverrideSupported.java b/javax/print/attribute/standard/PDLOverrideSupported.java
index 02c9c198c..310264a0c 100644
--- a/javax/print/attribute/standard/PDLOverrideSupported.java
+++ b/javax/print/attribute/standard/PDLOverrideSupported.java
@@ -49,7 +49,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * <p>
  * <b>IPP Compatibility:</b> PDLOverrideSupported is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -64,22 +64,22 @@ public class PDLOverrideSupported extends EnumSyntax
    */
   public static final PDLOverrideSupported NOT_ATTEMPTED =
     new PDLOverrideSupported(0);
-  
+
   /**
    * Indicates that the print service is capable of
    * attempting to override document data instructions.
    */
   public static final PDLOverrideSupported ATTEMPTED =
     new PDLOverrideSupported(1);
-  
+
   private static final String[] stringTable = { "not-attempted", "attempted" };
-  
+
   private static final PDLOverrideSupported[] enumValueTable = { NOT_ATTEMPTED,
                                                                  ATTEMPTED};
 
   /**
    * Constructs a <code>PDLOverrideSupported</code> object.
-   * 
+   *
    * @param value the enum value
    */
   protected PDLOverrideSupported(int value)
@@ -106,7 +106,7 @@ public class PDLOverrideSupported extends EnumSyntax
   {
     return "pdl-override-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/PageRanges.java b/javax/print/attribute/standard/PageRanges.java
index 9637a917f..2250868d7 100644
--- a/javax/print/attribute/standard/PageRanges.java
+++ b/javax/print/attribute/standard/PageRanges.java
@@ -45,17 +45,17 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.SetOfIntegerSyntax;
 
 /**
- * The <code>PageRanges</code> printing attribute specifies the 
+ * The <code>PageRanges</code> printing attribute specifies the
  * range(s) of pages to be printed in a print job.
  * <p>
- * <b>Note:</b> The effect of this attribute on jobs with multiple 
- * documents is controlled by the job attribute 
+ * <b>Note:</b> The effect of this attribute on jobs with multiple
+ * documents is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> PageRanges is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,7 +75,7 @@ public final class PageRanges extends SetOfIntegerSyntax
   public PageRanges(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
@@ -87,13 +87,13 @@ public final class PageRanges extends SetOfIntegerSyntax
    * @param members the page ranges to be printed.
    *
    * @exception IllegalArgumentException if any element is invalid
-   * @exception NullPointerException if members is <code>null</code> or any 
+   * @exception NullPointerException if members is <code>null</code> or any
    * element of members is <code>null</code>.
    */
   public PageRanges(int[][] members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
@@ -111,11 +111,11 @@ public final class PageRanges extends SetOfIntegerSyntax
   public PageRanges(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerbound may not be less than 1");
   }
-  
+
   /**
    * Constructs a <code>PageRanges</code> object with a set
    * of ranges to be printed in string array form.
@@ -123,30 +123,30 @@ public final class PageRanges extends SetOfIntegerSyntax
    * @param members the page ranges to be printed in string form.
    *
    * @exception IllegalArgumentException if any element is invalid.
-   * @exception NullPointerException if members is <code>null</code> or any 
+   * @exception NullPointerException if members is <code>null</code> or any
    * element of members is <code>null</code>.
    */
   public PageRanges(String members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof PageRanges))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/PagesPerMinute.java b/javax/print/attribute/standard/PagesPerMinute.java
index 6305842c0..bd086817a 100644
--- a/javax/print/attribute/standard/PagesPerMinute.java
+++ b/javax/print/attribute/standard/PagesPerMinute.java
@@ -1,4 +1,4 @@
-/* PagesPerMinute.java -- 
+/* PagesPerMinute.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,20 +43,20 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The <code>PagesPerMinute</code> printing attribute specifies 
+ * The <code>PagesPerMinute</code> printing attribute specifies
  * the nominal number of pages per minute which may be printed
- * by the printer. 
+ * by the printer.
  * <p>
  * <b>IPP Compatibility:</b> PagesPerMinute is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PagesPerMinute extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = -6366403993072862015L;
-  
+
   /**
    * Creates a <code>PagesPerMinute</code> object.
    *
@@ -71,13 +71,13 @@ public final class PagesPerMinute extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PagesPerMinuteColor.java b/javax/print/attribute/standard/PagesPerMinuteColor.java
index 3d5fa2ca5..f32bbdb19 100644
--- a/javax/print/attribute/standard/PagesPerMinuteColor.java
+++ b/javax/print/attribute/standard/PagesPerMinuteColor.java
@@ -1,4 +1,4 @@
-/* PagesPerMinuteColor.java -- 
+/* PagesPerMinuteColor.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,20 +42,20 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The <code>PagesPerMinuteColor</code> printing attribute specifies 
+ * The <code>PagesPerMinuteColor</code> printing attribute specifies
  * the nominal number of pages per minute which may be printed in
- * color by the printer. 
+ * color by the printer.
  * <p>
  * <b>IPP Compatibility:</b> PagesPerMinuteColor is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch
  */
 public final class PagesPerMinuteColor extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = 1684993151687470944L;
-  
+
   /**
    * Creates a <code>PagesPerMinuteColor</code> object.
    *
@@ -70,13 +70,13 @@ public final class PagesPerMinuteColor extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PresentationDirection.java b/javax/print/attribute/standard/PresentationDirection.java
index 14d560533..62c19b241 100644
--- a/javax/print/attribute/standard/PresentationDirection.java
+++ b/javax/print/attribute/standard/PresentationDirection.java
@@ -45,13 +45,13 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The <code>PresentationDirection</code> attribute specifies
- * a value to be used together with the <code>NumberUp</code> attribute 
+ * a value to be used together with the <code>NumberUp</code> attribute
  * to indicate the layout of multiple pages on a single media sheet.
  * <p>
- * <b>IPP Compatibility:</b> PresentationDirection is not an IPP 1.1 
+ * <b>IPP Compatibility:</b> PresentationDirection is not an IPP 1.1
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -61,72 +61,72 @@ public final class PresentationDirection extends EnumSyntax
   private static final long serialVersionUID = 8294728067230931780L;
 
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the top left towards the bottom left.
    */
   public static final PresentationDirection TOBOTTOM_TORIGHT =
     new PresentationDirection(0);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the top right towards the bottom left.
    */
   public static final PresentationDirection TOBOTTOM_TOLEFT =
     new PresentationDirection(1);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the bottom left towards the top right.
    */
   public static final PresentationDirection TOTOP_TORIGHT =
     new PresentationDirection(2);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the bottom right towards the top left.
    */
   public static final PresentationDirection TOTOP_TOLEFT =
     new PresentationDirection(3);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the top left towards the right bottom.
    */
   public static final PresentationDirection TORIGHT_TOBOTTOM =
     new PresentationDirection(4);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the bottom left towards the right top.
    */
   public static final PresentationDirection TORIGHT_TOTOP =
     new PresentationDirection(5);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the top right towards the left bottom.
    */
   public static final PresentationDirection TOLEFT_TOBOTTOM =
     new PresentationDirection(6);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the bottom right towards the left top.
    */
   public static final PresentationDirection TOLEFT_TOTOP =
     new PresentationDirection(7);
 
-  private static final String[] stringTable = { "tobottom-toright", 
-    "tobottom-toleft", "totop-toright", "totop-toleft", "toright-tobottom", 
+  private static final String[] stringTable = { "tobottom-toright",
+    "tobottom-toleft", "totop-toright", "totop-toleft", "toright-tobottom",
     "toright-totop", "toleft-tobottom", "toleft-totop" };
 
-  private static final PresentationDirection[] enumValueTable = 
-    { TOBOTTOM_TORIGHT, TOBOTTOM_TOLEFT, TOTOP_TORIGHT, TOTOP_TOLEFT, 
+  private static final PresentationDirection[] enumValueTable =
+    { TOBOTTOM_TORIGHT, TOBOTTOM_TOLEFT, TOTOP_TORIGHT, TOTOP_TOLEFT,
       TORIGHT_TOBOTTOM, TORIGHT_TOTOP, TOLEFT_TOBOTTOM, TOLEFT_TOTOP };
-  
+
   /**
    * Constructs a <code>PresentationDirection</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   private PresentationDirection(int value)
@@ -153,7 +153,7 @@ public final class PresentationDirection extends EnumSyntax
   {
     return "presentation-direction";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/PrintQuality.java b/javax/print/attribute/standard/PrintQuality.java
index bc94d532b..aa65e89a7 100644
--- a/javax/print/attribute/standard/PrintQuality.java
+++ b/javax/print/attribute/standard/PrintQuality.java
@@ -50,7 +50,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * <b>IPP Compatibility:</b> PrintQuality is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,28 +59,28 @@ public class PrintQuality extends EnumSyntax
 {
   private static final long serialVersionUID = -3072341285225858365L;
 
-  /** 
-   * Draft quality of the printer. 
+  /**
+   * Draft quality of the printer.
    */
   public static final PrintQuality DRAFT = new PrintQuality(3);
-  
-  /** 
-   * Normal quality of the printer. 
+
+  /**
+   * Normal quality of the printer.
    */
   public static final PrintQuality NORMAL = new PrintQuality(4);
-  
-  /** 
-   * High quality of the printer. 
+
+  /**
+   * High quality of the printer.
    */
   public static final PrintQuality HIGH = new PrintQuality(5);
 
   private static final String[] stringTable = { "draft", "normal", "high" };
-  
+
   private static final PrintQuality[] enumValueTable = { DRAFT, NORMAL, HIGH };
-  
+
   /**
    * Constructs a <code>PrintQuality</code> object.
-   * 
+   *
    * @param value the value of the enum
    */
   protected PrintQuality(int value)
@@ -107,7 +107,7 @@ public class PrintQuality extends EnumSyntax
   {
     return "print-quality";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -127,7 +127,7 @@ public class PrintQuality extends EnumSyntax
   protected EnumSyntax[] getEnumValueTable()
   {
     return enumValueTable;
-  }  
+  }
 
   /**
    * Returns the lowest used value by the enumerations of this class.
diff --git a/javax/print/attribute/standard/PrinterInfo.java b/javax/print/attribute/standard/PrinterInfo.java
index e287f8ce9..01d2065bf 100644
--- a/javax/print/attribute/standard/PrinterInfo.java
+++ b/javax/print/attribute/standard/PrinterInfo.java
@@ -1,4 +1,4 @@
-/* PrinterInfo.java -- 
+/* PrinterInfo.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>PrinterInfo</code> printing attribute provides 
+ * The <code>PrinterInfo</code> printing attribute provides
  * informations about a printer device.
  * <p>
  * <b>IPP Compatibility:</b> PrinterInfo is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterInfo extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterInfo extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
index 1c9c39930..5ac6bf71d 100644
--- a/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
+++ b/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
@@ -43,16 +43,16 @@ import javax.print.attribute.PrintServiceAttribute;
 
 
 /**
- * The <code>PrinterIsAcceptingJobs</code> printing attribute signals 
+ * The <code>PrinterIsAcceptingJobs</code> printing attribute signals
  * if a print services is currently accepting jobs.
  * <p>
  * <b>IPP Compatibility:</b> PrinterIsAcceptingJobs is an IPP 1.1 attribute.
- * The IPP specification treats PrinterIsAcceptingJobs as boolean type which 
- * is not available in the Java Print Service API. The IPP boolean value "true" 
- * corresponds to <code>ACCEPTING_JOBS</code> and "false" 
+ * The IPP specification treats PrinterIsAcceptingJobs as boolean type which
+ * is not available in the Java Print Service API. The IPP boolean value "true"
+ * corresponds to <code>ACCEPTING_JOBS</code> and "false"
  * to <code>NOT_ACCEPTING_JOBS</code>.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -66,22 +66,22 @@ public final class PrinterIsAcceptingJobs extends EnumSyntax
    */
   public static final PrinterIsAcceptingJobs NOT_ACCEPTING_JOBS =
     new PrinterIsAcceptingJobs(0);
-  
+
   /**
    * The printer is accepting jobs.
    */
   public static final PrinterIsAcceptingJobs ACCEPTING_JOBS =
     new PrinterIsAcceptingJobs(1);
 
-  private static final String[] stringTable = { "not-accepting-jobs", 
+  private static final String[] stringTable = { "not-accepting-jobs",
                                                 "accepting-jobs" };
-  
-  private static final PrinterIsAcceptingJobs[] enumValueTable = 
+
+  private static final PrinterIsAcceptingJobs[] enumValueTable =
     { NOT_ACCEPTING_JOBS, ACCEPTING_JOBS };
-  
+
   /**
    * Constructs a <code>PrinterIsAcceptingJobs</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterIsAcceptingJobs(int value)
@@ -108,7 +108,7 @@ public final class PrinterIsAcceptingJobs extends EnumSyntax
   {
     return "printer-is-accepting-jobs";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/PrinterLocation.java b/javax/print/attribute/standard/PrinterLocation.java
index 7a446adcb..934f1bdd3 100644
--- a/javax/print/attribute/standard/PrinterLocation.java
+++ b/javax/print/attribute/standard/PrinterLocation.java
@@ -1,4 +1,4 @@
-/* PrinterLocation.java -- 
+/* PrinterLocation.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>PrinterLocation</code> printing attribute provides the location 
+ * The <code>PrinterLocation</code> printing attribute provides the location
  * of a printer device. This may be a room and building name for example.
  * <p>
  * <b>IPP Compatibility:</b> PrinterLocation is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterLocation extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterLocation extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterMakeAndModel.java b/javax/print/attribute/standard/PrinterMakeAndModel.java
index 77fd84b4a..a78fe1472 100644
--- a/javax/print/attribute/standard/PrinterMakeAndModel.java
+++ b/javax/print/attribute/standard/PrinterMakeAndModel.java
@@ -1,4 +1,4 @@
-/* PrinterMakeAndModel.java -- 
+/* PrinterMakeAndModel.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ import javax.print.attribute.TextSyntax;
  * <p>
  * <b>IPP Compatibility:</b> PrinterMakeAndModel is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterMakeAndModel extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterMakeAndModel extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterMessageFromOperator.java b/javax/print/attribute/standard/PrinterMessageFromOperator.java
index 55bc7406a..3bd3ee41c 100644
--- a/javax/print/attribute/standard/PrinterMessageFromOperator.java
+++ b/javax/print/attribute/standard/PrinterMessageFromOperator.java
@@ -1,4 +1,4 @@
-/* PrinterMessageFromOperator.java -- 
+/* PrinterMessageFromOperator.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,15 +45,15 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>PrinterMessageFromOperator</code> printing attribute provides 
- * a message from an operator or a system administrator related to the 
+ * The <code>PrinterMessageFromOperator</code> printing attribute provides
+ * a message from an operator or a system administrator related to the
  * printer. This may include informations about the status of the printer
  * or expected downtimes, etc.
  * <p>
- * <b>IPP Compatibility:</b> PrinterMessageFromOperator is an IPP 1.1 
+ * <b>IPP Compatibility:</b> PrinterMessageFromOperator is an IPP 1.1
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterMessageFromOperator extends TextSyntax
@@ -80,7 +80,7 @@ public final class PrinterMessageFromOperator extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterMoreInfo.java b/javax/print/attribute/standard/PrinterMoreInfo.java
index de330fe0b..4af33c664 100644
--- a/javax/print/attribute/standard/PrinterMoreInfo.java
+++ b/javax/print/attribute/standard/PrinterMoreInfo.java
@@ -50,11 +50,11 @@ import javax.print.attribute.URISyntax;
  * <p>
  * The URI may for example contain a reference to a HTML page with information.
  * The information is normally intended for end users.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> PrinterMoreInfo is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,7 +65,7 @@ public final class PrinterMoreInfo extends URISyntax
 
   /**
    * Constructs a <code>PrinterMoreInfo</code> object.
-   * 
+   *
    * @param uri the URI of the information.
    * @throws NullPointerException if the given uri is null.
    */
@@ -73,13 +73,13 @@ public final class PrinterMoreInfo extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java b/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
index 73a627eb3..a0425d3a7 100644
--- a/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
+++ b/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
@@ -45,20 +45,20 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
 /**
- * The <code>PrinterMoreInfoManufacturer</code> attribute provides a URI that 
+ * The <code>PrinterMoreInfoManufacturer</code> attribute provides a URI that
  * can be used to obtain more information about the printer device type and
  * its manufacturer.
  * <p>
- * The URI may for example contain a reference to a website of the 
- * manufacturer, containing informations and links to the latest firmware, 
- * printer drivers, manual etc. The information is normally intended for 
+ * The URI may for example contain a reference to a website of the
+ * manufacturer, containing informations and links to the latest firmware,
+ * printer drivers, manual etc. The information is normally intended for
  * end users.
- * </p> 
+ * </p>
  * <p>
- * <b>IPP Compatibility:</b> PrinterMoreInfoManufacturer is an IPP 1.1 
+ * <b>IPP Compatibility:</b> PrinterMoreInfoManufacturer is an IPP 1.1
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -69,7 +69,7 @@ public final class PrinterMoreInfoManufacturer extends URISyntax
 
   /**
    * Constructs a <code>PrinterMoreInfoManufacturer</code> object.
-   * 
+   *
    * @param uri the URI of the information..
    * @throws NullPointerException if the given uri is null.
    */
@@ -77,13 +77,13 @@ public final class PrinterMoreInfoManufacturer extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterName.java b/javax/print/attribute/standard/PrinterName.java
index b084c2c0f..854826c67 100644
--- a/javax/print/attribute/standard/PrinterName.java
+++ b/javax/print/attribute/standard/PrinterName.java
@@ -1,4 +1,4 @@
-/* PrinterName.java -- 
+/* PrinterName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>PrinterName</code> printing attribute provides the name of a 
+ * The <code>PrinterName</code> printing attribute provides the name of a
  * print service. The name may but must not be related to parts of the
  * printer URI.
  * <p>
  * <b>IPP Compatibility:</b> PrinterName is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.PrinterURI
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterName extends TextSyntax
@@ -79,7 +79,7 @@ public final class PrinterName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/PrinterResolution.java b/javax/print/attribute/standard/PrinterResolution.java
index 7b60a0cad..acf3a63dc 100644
--- a/javax/print/attribute/standard/PrinterResolution.java
+++ b/javax/print/attribute/standard/PrinterResolution.java
@@ -45,12 +45,12 @@ import javax.print.attribute.ResolutionSyntax;
 
 
 /**
- * The <code>PrinterResolution</code> printing attribute specifies a 
- * resolution supported by a print service or to be used by a print job. 
+ * The <code>PrinterResolution</code> printing attribute specifies a
+ * resolution supported by a print service or to be used by a print job.
  * <p>
  * <b>IPP Compatibility:</b> PrinterResolution is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -74,20 +74,20 @@ public final class PrinterResolution extends ResolutionSyntax
   {
     super(crossFeedResolution, feedResolution, units);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
     if(! (obj instanceof PrinterResolution))
       return false;
-    
+
     return super.equals(obj);
   }
 
diff --git a/javax/print/attribute/standard/PrinterState.java b/javax/print/attribute/standard/PrinterState.java
index 4b85c0189..7670e144c 100644
--- a/javax/print/attribute/standard/PrinterState.java
+++ b/javax/print/attribute/standard/PrinterState.java
@@ -49,13 +49,13 @@ import javax.print.attribute.PrintServiceAttribute;
  * The {@link javax.print.attribute.standard.PrinterStateReasons}
  * attribute provides further detailed information about
  * the given printer state. Detailed information about the printer
- * state and printer state reasons attributes can be found in the 
+ * state and printer state reasons attributes can be found in the
  * RFC 2911.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> PrinterState is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -68,35 +68,35 @@ public final class PrinterState extends EnumSyntax
    * The state is unknown currently.
    */
   public static final PrinterState UNKNOWN = new PrinterState(0);
-  
+
   /**
    * The printer device is in idle state. New jobs can start
    * processing without waiting.
    */
   public static final PrinterState IDLE = new PrinterState(3);
-  
+
   /**
    * The printer device is in processing state.
    */
   public static final PrinterState PROCESSING = new PrinterState(4);
-  
+
   /**
    * The printer device has stopped. No jobs can be processed and
    * normally manual intervention is needed.
    */
   public static final PrinterState STOPPED = new PrinterState(5);
 
-  private static final String[] stringTable = { "unknown", null, null, 
-                                                "idle", "processing", 
+  private static final String[] stringTable = { "unknown", null, null,
+                                                "idle", "processing",
                                                 "stopped" };
-  
+
   private static final PrinterState[] enumValueTable = { UNKNOWN, null, null,
-                                                         IDLE, PROCESSING, 
+                                                         IDLE, PROCESSING,
                                                          STOPPED };
-  
+
   /**
    * Constructs a <code>PrinterState</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterState(int value)
@@ -123,7 +123,7 @@ public final class PrinterState extends EnumSyntax
   {
     return "printer-state";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/PrinterStateReason.java b/javax/print/attribute/standard/PrinterStateReason.java
index 1abb7c6aa..c3838b265 100644
--- a/javax/print/attribute/standard/PrinterStateReason.java
+++ b/javax/print/attribute/standard/PrinterStateReason.java
@@ -45,13 +45,13 @@ import javax.print.attribute.EnumSyntax;
  * The <code>PrinterStateReason</code> attribute provides additional
  * information about the current state of the printer device. Its always part
  * of the {@link javax.print.attribute.standard.PrinterStateReasons}
- * printing attribute. 
+ * printing attribute.
  * <p>
- * <b>IPP Compatibility:</b> PrinterStateReason is not an IPP 1.1 
+ * <b>IPP Compatibility:</b> PrinterStateReason is not an IPP 1.1
  * attribute itself but used inside the <code>PrinterStateReasons</code>
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -64,52 +64,52 @@ public class PrinterStateReason extends EnumSyntax
    * Any state other state not listed here.
    */
   public static final PrinterStateReason OTHER = new PrinterStateReason(0);
-  
+
   /**
    * A media tray has run out of media.
    */
   public static final PrinterStateReason MEDIA_NEEDED =
     new PrinterStateReason(1);
-  
+
   /**
    * A media jam occured in the printer device.
    */
   public static final PrinterStateReason MEDIA_JAM = new PrinterStateReason(2);
-  
+
   /**
    * Indicates that the printer has been paused by the pause printer
    * operation and is currently moving to the pause state.
    */
   public static final PrinterStateReason MOVING_TO_PAUSED =
     new PrinterStateReason(3);
-  
+
   /**
    * The printer device has be paused by the pause printer operation.
    */
   public static final PrinterStateReason PAUSED = new PrinterStateReason(4);
-  
+
   /**
    * The printer device has been shutdown or removed from service.
    */
   public static final PrinterStateReason SHUTDOWN = new PrinterStateReason(5);
-  
+
   /**
    * The printer object is connecting to the device. If a printer
-   * device is on the network the printer object may be unable to connect. 
+   * device is on the network the printer object may be unable to connect.
    */
   public static final PrinterStateReason CONNECTING_TO_DEVICE =
     new PrinterStateReason(6);
-  
+
   /**
-   * The connection to the device has timed out. 
+   * The connection to the device has timed out.
    */
   public static final PrinterStateReason TIMED_OUT = new PrinterStateReason(7);
-  
+
   /**
    * The printer object is stopping the printer device.
    */
   public static final PrinterStateReason STOPPING = new PrinterStateReason(8);
-  
+
   /**
    * The printer object has stopped partly. A printer object may control
    * several physical output devices (e.g. a printer class in CUPS) and
@@ -117,170 +117,170 @@ public class PrinterStateReason extends EnumSyntax
    */
   public static final PrinterStateReason STOPPED_PARTLY =
     new PrinterStateReason(9);
-  
+
   /**
    * The printer device is low on toner.
    */
   public static final PrinterStateReason TONER_LOW =
     new PrinterStateReason(10);
-  
+
   /**
    * The printer device is out of toner.
    */
   public static final PrinterStateReason TONER_EMPTY =
     new PrinterStateReason(11);
-  
+
   /**
    * The printers spool area is currently full. The printer is
    * currently not able to accept jobs.
    */
   public static final PrinterStateReason SPOOL_AREA_FULL =
     new PrinterStateReason(12);
-  
+
   /**
    * One or more covers of the printer device are open.
    */
   public static final PrinterStateReason COVER_OPEN =
     new PrinterStateReason(13);
-  
+
   /**
    * One or more interlocks of the printer device are open.
    */
   public static final PrinterStateReason INTERLOCK_OPEN =
     new PrinterStateReason(14);
-  
+
   /**
    * One or more doors of the printer device are open.
    */
   public static final PrinterStateReason DOOR_OPEN =
     new PrinterStateReason(15);
-  
+
   /**
    * One or more input trays are missing in the printer device.
    */
   public static final PrinterStateReason INPUT_TRAY_MISSING =
     new PrinterStateReason(16);
-  
+
   /**
    * The printer device is low on media.
    */
   public static final PrinterStateReason MEDIA_LOW =
     new PrinterStateReason(17);
-  
+
   /**
    * The printer device is out of media.
    */
   public static final PrinterStateReason MEDIA_EMPTY =
     new PrinterStateReason(18);
-  
+
   /**
    * One or more output trays are missing in the printer device.
    */
   public static final PrinterStateReason OUTPUT_TRAY_MISSING =
     new PrinterStateReason(19);
-  
+
   /**
    * One or more output areas of the printer device are almost full.
    */
   public static final PrinterStateReason OUTPUT_AREA_ALMOST_FULL =
     new PrinterStateReason(20);
-  
+
   /**
    * One or more output areas of the printer device are full.
    */
   public static final PrinterStateReason OUTPUT_AREA_FULL =
     new PrinterStateReason(21);
-  
+
   /**
    * The printer device is low on marker supply.
    */
   public static final PrinterStateReason MARKER_SUPPLY_LOW =
     new PrinterStateReason(22);
-  
+
   /**
    * The printer device is out of marker supply.
    */
   public static final PrinterStateReason MARKER_SUPPLY_EMPTY =
     new PrinterStateReason(23);
-  
+
   /**
    * The marker waste bin of the printer device is almost full.
    */
   public static final PrinterStateReason MARKER_WASTE_ALMOST_FULL =
     new PrinterStateReason(24);
-  
+
   /**
    * The marker waste bin of the printer device is full.
    */
   public static final PrinterStateReason MARKER_WASTE_FULL =
     new PrinterStateReason(25);
-  
+
   /**
    * The fuser of the printer device is over temperature.
    */
   public static final PrinterStateReason FUSER_OVER_TEMP =
     new PrinterStateReason(26);
-  
+
   /**
    * The fuser of the printer device is under the needed temperature.
    */
   public static final PrinterStateReason FUSER_UNDER_TEMP =
     new PrinterStateReason(27);
-  
+
   /**
    * The optical photo conductor is near its end of life (EOL).
    */
   public static final PrinterStateReason OPC_NEAR_EOL =
     new PrinterStateReason(28);
-  
+
   /**
    * The optical photo conductor has reached its end of life.
    */
   public static final PrinterStateReason OPC_LIFE_OVER =
     new PrinterStateReason(29);
-  
+
   /**
    * The printer device is low on developer.
    */
   public static final PrinterStateReason DEVELOPER_LOW =
     new PrinterStateReason(30);
-  
+
   /**
    * The printer device is out of developer.
    */
   public static final PrinterStateReason DEVELOPER_EMPTY =
     new PrinterStateReason(31);
-  
+
   /**
    * An interpreter resource (e.g. font) is unavailable.
    */
   public static final PrinterStateReason INTERPRETER_RESOURCE_UNAVAILABLE =
     new PrinterStateReason(32);
 
-  private static final String[] stringTable = 
-    { "other", "media-needed",  "media-jam", "moving-to-paused", "paused", 
-    "shutdown", "connecting-to-device", "timed-out", "stopping", 
-    "stopped-partly", "toner-low", "toner-empty", "spool-area-full", 
-    "cover-open", "interlock-open", "door-open", "input-tray-missing", 
+  private static final String[] stringTable =
+    { "other", "media-needed",  "media-jam", "moving-to-paused", "paused",
+    "shutdown", "connecting-to-device", "timed-out", "stopping",
+    "stopped-partly", "toner-low", "toner-empty", "spool-area-full",
+    "cover-open", "interlock-open", "door-open", "input-tray-missing",
     "media-low", "media-empty", "output-tray-missing", "output-area-almost-full",
-    "output-area-full", "marker-supply-low", "marker-supply-empty", 
-    "marker-waste-almost-full", "marker-waste-full", "fuser-over-temp", 
-    "fuser-under-temp", "opc-near-eol", "opc-life-over", "developer-low", 
+    "output-area-full", "marker-supply-low", "marker-supply-empty",
+    "marker-waste-almost-full", "marker-waste-full", "fuser-over-temp",
+    "fuser-under-temp", "opc-near-eol", "opc-life-over", "developer-low",
     "developer-empty", "interpreter-resource-unavailable" };
 
-  private static final PrinterStateReason[] enumValueTable = 
+  private static final PrinterStateReason[] enumValueTable =
     { OTHER, MEDIA_NEEDED, MEDIA_JAM, MOVING_TO_PAUSED, PAUSED, SHUTDOWN,
     CONNECTING_TO_DEVICE, TIMED_OUT, STOPPING, STOPPED_PARTLY, TONER_LOW,
     TONER_EMPTY, SPOOL_AREA_FULL, COVER_OPEN, INTERLOCK_OPEN, DOOR_OPEN,
     INPUT_TRAY_MISSING, MEDIA_LOW, MEDIA_EMPTY, OUTPUT_TRAY_MISSING,
     OUTPUT_AREA_ALMOST_FULL, OUTPUT_AREA_FULL, MARKER_SUPPLY_LOW,
     MARKER_SUPPLY_EMPTY, MARKER_WASTE_ALMOST_FULL, MARKER_WASTE_FULL,
-    FUSER_OVER_TEMP, FUSER_UNDER_TEMP, OPC_NEAR_EOL, OPC_LIFE_OVER, 
+    FUSER_OVER_TEMP, FUSER_UNDER_TEMP, OPC_NEAR_EOL, OPC_LIFE_OVER,
     DEVELOPER_LOW, DEVELOPER_EMPTY, INTERPRETER_RESOURCE_UNAVAILABLE };
 
   /**
    * Constructs a <code>PrinterStateReason</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterStateReason(int value)
@@ -307,7 +307,7 @@ public class PrinterStateReason extends EnumSyntax
   {
     return "printer-state-reason";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/PrinterStateReasons.java b/javax/print/attribute/standard/PrinterStateReasons.java
index 3e77e181e..5a52b8a30 100644
--- a/javax/print/attribute/standard/PrinterStateReasons.java
+++ b/javax/print/attribute/standard/PrinterStateReasons.java
@@ -49,15 +49,15 @@ import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The <code>PrinterStateReasons</code> attribute provides the set of 
- * additional informations available about the current state of the printer 
+ * The <code>PrinterStateReasons</code> attribute provides the set of
+ * additional informations available about the current state of the printer
  * device.
  * <p>
  * The attribute is basically a map with <code>PrinterStateReason</code>
- * objects as keys associated with their severity level as 
- * <code>Severity</code> instances. The IPP keyword value can be 
+ * objects as keys associated with their severity level as
+ * <code>Severity</code> instances. The IPP keyword value can be
  * constructed as follows: <br>
- * <code>reason.toString() + '-' + severity.toString()</code> 
+ * <code>reason.toString() + '-' + severity.toString()</code>
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> PrinterStateReasons is an IPP 1.1 attribute.
@@ -65,7 +65,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * @see javax.print.attribute.standard.PrinterState
  * @see javax.print.attribute.standard.PrinterStateReason
  * @see javax.print.attribute.standard.Severity
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -77,7 +77,7 @@ public final class PrinterStateReasons
 
   /**
    * Constructs an empty <code>PrinterStateReasons</code> attribute.
-   */  
+   */
   public PrinterStateReasons()
   {
     super();
@@ -86,10 +86,10 @@ public final class PrinterStateReasons
   /**
    * Constructs an empty <code>PrinterStateReasons</code> attribute
    * with the given initial capacity and load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
    * @param loadFactor the load factor of the underlying HashMap.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity &lt; 0
    * @throws IllegalArgumentException if initialCapacity or loadFactor &lt; 0
    */
@@ -101,9 +101,9 @@ public final class PrinterStateReasons
   /**
    * Constructs an empty <code>PrinterStateReasons</code> attribute
    * with the given initial capacity and the default load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity &lt; 0
    */
   public PrinterStateReasons(int initialCapacity)
@@ -114,13 +114,13 @@ public final class PrinterStateReasons
   /**
    * Constructs a <code>PrinterStateReasons</code> attribute
    * with the given content of the map.
-   * 
-   * @param map the map for the initial values with the same 
+   *
+   * @param map the map for the initial values with the same
    * <code>PrinterStateReason</code> to <code>Severity</code> mappings.
-   * 
+   *
    * @throws NullPointerException if map or any key/value is <code>null</code>.
-   * @throws ClassCastException if values of map are not of type 
-   * <code>PrinterStateReason</code> and keys are not of type 
+   * @throws ClassCastException if values of map are not of type
+   * <code>PrinterStateReason</code> and keys are not of type
    * <code>Severity</code>.
    */
   public PrinterStateReasons(Map<PrinterStateReason,Severity> map)
@@ -135,7 +135,7 @@ public final class PrinterStateReasons
   /**
    * Constructs an unmodifiable view of the contained printer state reasons
    * associated with the given severity level.
-   * 
+   *
    * @param severity the severity level for the constructed set.
    * @return The set of printer state reasons.
    */
@@ -143,7 +143,7 @@ public final class PrinterStateReasons
   {
     if (severity == null)
       throw new NullPointerException("severity is null");
-    
+
     HashSet set = new HashSet();
     Iterator it = entrySet().iterator();
     while (it.hasNext())
@@ -152,35 +152,35 @@ public final class PrinterStateReasons
         if (entry.getValue().equals(severity))
           set.add(entry.getKey());
       }
-    
+
     return Collections.unmodifiableSet(set);
   }
-  
+
   /**
    * Puts the given reason object associated with the given severity object
    * into the set.
-   * 
+   *
    * @param reason the reason of type <code>PrinterStateReason</code>.
    * @param severity the severity of the reason of type <code>Severity</code>.
-   * 
-   * @return The previously associated severity of the reason or 
+   *
+   * @return The previously associated severity of the reason or
    * <code>null</code> if the reason object was not in the map before.
-   * 
+   *
    * @throws NullPointerException if any of the values is <code>null</code>.
-   * @throws ClassCastException if reason is not a 
-   * <code>PrinterStateReason</code> and severity is not a 
+   * @throws ClassCastException if reason is not a
+   * <code>PrinterStateReason</code> and severity is not a
    * <code>Severity</code> instance.
    */
   public Severity put(PrinterStateReason reason,Severity severity)
   {
     if (reason == null)
-      throw new NullPointerException("reason is null");    
+      throw new NullPointerException("reason is null");
     if (severity == null)
       throw new NullPointerException("severity is null");
-    
+
     return super.put(reason, severity);
-  }   
-  
+  }
+
   /**
    * Returns category of this class.
    *
diff --git a/javax/print/attribute/standard/PrinterURI.java b/javax/print/attribute/standard/PrinterURI.java
index 017e6b85a..8127a4901 100644
--- a/javax/print/attribute/standard/PrinterURI.java
+++ b/javax/print/attribute/standard/PrinterURI.java
@@ -45,16 +45,16 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
 /**
- * The <code>PrinterURI</code> attribute provides the URI of a printer. 
+ * The <code>PrinterURI</code> attribute provides the URI of a printer.
  * <p>
- * The URI identifies the printer against all the other print services 
- * available. This attribute is used to direct a print service request 
+ * The URI identifies the printer against all the other print services
+ * available. This attribute is used to direct a print service request
  * to this specific printer.
- * </p> 
+ * </p>
  * <p>
  * <b>IPP Compatibility:</b> PrinterURI is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,7 +65,7 @@ public final class PrinterURI extends URISyntax
 
   /**
    * Constructs a <code>PrinterURI</code> object.
-   * 
+   *
    * @param uri the URI of the print service.
    * @throws NullPointerException if the given uri is null.
    */
@@ -73,13 +73,13 @@ public final class PrinterURI extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/QueuedJobCount.java b/javax/print/attribute/standard/QueuedJobCount.java
index d024b3dcc..90d4d4b1a 100644
--- a/javax/print/attribute/standard/QueuedJobCount.java
+++ b/javax/print/attribute/standard/QueuedJobCount.java
@@ -1,4 +1,4 @@
-/* QueuedJobCount.java -- 
+/* QueuedJobCount.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,22 +42,22 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The <code>QueuedJobCount</code> printing attribute reports 
+ * The <code>QueuedJobCount</code> printing attribute reports
  * the number of jobs currently in the queue. These are jobs
  * that are in 'pending', 'processing', 'pending-held' or
- * 'processing-stopped' state. 
+ * 'processing-stopped' state.
  * <p>
  * <b>IPP Compatibility:</b> QueuedJobCount is an IPP 1.1 attribute.
  * </p>
  * @see javax.print.attribute.standard.JobState
- * 
+ *
  * @author Michael Koch
  */
 public final class QueuedJobCount extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = 7499723077864047742L;
-  
+
   /**
    * Creates a <code>QueuedJobCount</code> object.
    *
@@ -72,13 +72,13 @@ public final class QueuedJobCount extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 9d2354bd6..2d47c77c3 100644
--- a/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -42,14 +42,14 @@ import javax.print.attribute.EnumSyntax;
 
 
 /**
- * The <code>ReferenceUriSchemesSupported</code> attribute provides 
+ * The <code>ReferenceUriSchemesSupported</code> attribute provides
  * the supported URI schemes (e.g. ftp) which are supported by the
  * printer service to be used as uri reference for document data.
  * <p>
- * <b>IPP Compatibility:</b> ReferenceUriSchemesSupported is an IPP 1.1 
+ * <b>IPP Compatibility:</b> ReferenceUriSchemesSupported is an IPP 1.1
  * attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -63,59 +63,59 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    */
   public static final ReferenceUriSchemesSupported FTP =
     new ReferenceUriSchemesSupported(0);
-  
+
   /**
    * The hyper text transfer protocol (HTTP).
    */
   public static final ReferenceUriSchemesSupported HTTP =
     new ReferenceUriSchemesSupported(1);
-  
+
   /**
    * The secure hyper text transfer protocol (HTTPS).
    */
   public static final ReferenceUriSchemesSupported HTTPS =
     new ReferenceUriSchemesSupported(2);
-  
+
   /**
    * The gopher protocol.
    */
   public static final ReferenceUriSchemesSupported GOPHER =
     new ReferenceUriSchemesSupported(3);
-  
+
   /**
    * The USENET news - RFC 1738.
    */
   public static final ReferenceUriSchemesSupported NEWS =
     new ReferenceUriSchemesSupported(4);
-  
+
   /**
    * The network news transfer protocol (NNTP) - RFC 1738.
    */
   public static final ReferenceUriSchemesSupported NNTP =
     new ReferenceUriSchemesSupported(5);
-  
+
   /**
    * The wide area information server protocol (WAIS) - RFC 4156.
    */
   public static final ReferenceUriSchemesSupported WAIS =
     new ReferenceUriSchemesSupported(6);
-  
+
   /**
    * A filename specific to the host.
    */
   public static final ReferenceUriSchemesSupported FILE =
     new ReferenceUriSchemesSupported(7);
 
-  private static final String[] stringTable = { "ftp", "http", "https", 
-                                                "gopher", "news", "nntp", 
+  private static final String[] stringTable = { "ftp", "http", "https",
+                                                "gopher", "news", "nntp",
                                                 "wais", "file" };
 
-  private static final ReferenceUriSchemesSupported[] enumValueTable = 
+  private static final ReferenceUriSchemesSupported[] enumValueTable =
     { FTP, HTTP, HTTPS, GOPHER, NEWS, NNTP, WAIS, FILE };
 
   /**
    * Constructs a <code>ReferenceUriSchemeSupported</code> object.
-   * 
+   *
    * @param value the enum value.
    */
   protected ReferenceUriSchemesSupported(int value)
@@ -142,7 +142,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
   {
     return "reference-uri-schemes-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/RequestingUserName.java b/javax/print/attribute/standard/RequestingUserName.java
index b7b85abbd..52a13a8c0 100644
--- a/javax/print/attribute/standard/RequestingUserName.java
+++ b/javax/print/attribute/standard/RequestingUserName.java
@@ -1,4 +1,4 @@
-/* RequestingUserName.java -- 
+/* RequestingUserName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The <code>RequestingUserName</code> attribute provides the name of 
+ * The <code>RequestingUserName</code> attribute provides the name of
  * the user which requests the printing of the given job.
  * <p>
  * <b>IPP Compatibility:</b> RequestingUserName is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class RequestingUserName extends TextSyntax
@@ -77,7 +77,7 @@ public final class RequestingUserName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return <code>true</code> if both objects are equal, 
+   * @return <code>true</code> if both objects are equal,
    * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
diff --git a/javax/print/attribute/standard/Severity.java b/javax/print/attribute/standard/Severity.java
index 019c8c6fc..ee0e6a17f 100644
--- a/javax/print/attribute/standard/Severity.java
+++ b/javax/print/attribute/standard/Severity.java
@@ -45,16 +45,16 @@ import javax.print.attribute.EnumSyntax;
  * The <code>Severity</code> printing attribute specifies the severity
  * for a <code>PrinterStateReason</code> attribute.
  * <p>
- * This attribute does not appear in the attribute set of a print service 
- * itself. Its used inside the <code>PrinterStateReasons</code> 
- * attribute which contains <code>PrinterStateReason</code> objects which 
+ * This attribute does not appear in the attribute set of a print service
+ * itself. Its used inside the <code>PrinterStateReasons</code>
+ * attribute which contains <code>PrinterStateReason</code> objects which
  * informs about the print service's status.
  * </p>
  * <p>
  * <b>IPP Compatibility:</b> Severity is not an IPP attribute on its own
  * but used in the PrinterStateReason attribute to indicate the severity.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -67,21 +67,21 @@ public final class Severity extends EnumSyntax
    * Indicates that the reason is a report.
    */
   public static final Severity REPORT = new Severity(0);
-  
+
   /**
    * Indicates that the reason is a warning.
    */
   public static final Severity WARNING = new Severity(1);
-  
+
   /**
    * Indicates that the reason is an error.
    */
   public static final Severity ERROR = new Severity(2);
 
   private static final String[] stringTable = { "report", "warning", "error" };
-  
+
   private static final Severity[] enumValueTable = { REPORT, WARNING, ERROR };
-  
+
   /**
    * Constructs a <code>Severity</code> object.
    *
@@ -111,7 +111,7 @@ public final class Severity extends EnumSyntax
   {
     return "severity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/SheetCollate.java b/javax/print/attribute/standard/SheetCollate.java
index 886b8d6c9..008a6e845 100644
--- a/javax/print/attribute/standard/SheetCollate.java
+++ b/javax/print/attribute/standard/SheetCollate.java
@@ -45,7 +45,7 @@ import javax.print.attribute.PrintRequestAttribute;
 
 
 /**
- * The <code>SheetCollate</code> printing attribute specifies 
+ * The <code>SheetCollate</code> printing attribute specifies
  * whether or not the sheets of each copy in a print job have to be
  * in sequence.
  * <p>
@@ -58,7 +58,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * <p>
  * <b>IPP Compatibility:</b> SheetCollate is not an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -71,7 +71,7 @@ public final class SheetCollate extends EnumSyntax
    * The sheets of the different copies are uncollated.
    */
   public static final SheetCollate UNCOLLATED = new SheetCollate(0);
-  
+
   /**
    * The sheets of the different copies are collated.
    */
@@ -79,10 +79,10 @@ public final class SheetCollate extends EnumSyntax
 
 
   private static final String[] stringTable = { "uncollated", "collated" };
-  
-  private static final SheetCollate[] enumValueTable = { UNCOLLATED, 
-                                                         COLLATED };  
-  
+
+  private static final SheetCollate[] enumValueTable = { UNCOLLATED,
+                                                         COLLATED };
+
   /**
    * Creates a <code>SheetCollate</code> object.
    *
@@ -112,7 +112,7 @@ public final class SheetCollate extends EnumSyntax
   {
     return "sheet-collate";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/attribute/standard/Sides.java b/javax/print/attribute/standard/Sides.java
index 02fe4a1e5..ca2a60fc7 100644
--- a/javax/print/attribute/standard/Sides.java
+++ b/javax/print/attribute/standard/Sides.java
@@ -46,11 +46,11 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The <code>Sides</code> printing attribute specifies how consecutive
- * printing pages are arranged on the media sheet. 
+ * printing pages are arranged on the media sheet.
  * <p>
  * <b>IPP Compatibility:</b> Sides is an IPP 1.1 attribute.
  * </p>
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,41 +59,41 @@ public final class Sides extends EnumSyntax
 {
   private static final long serialVersionUID = -6890309414893262822L;
 
-  /** 
-   * Specifies that each page should be printed on one sheet. 
+  /**
+   * Specifies that each page should be printed on one sheet.
    */
   public static final Sides ONE_SIDED = new Sides(0);
-  
-  /** 
-   * Specifies that two following pages should be printed on the 
+
+  /**
+   * Specifies that two following pages should be printed on the
    * front and back of one sheet for binding on the long edge.
    */
   public static final Sides TWO_SIDED_LONG_EDGE = new Sides(1);
-  
-  /** 
-   * Specifies that two following pages should be printed on the 
+
+  /**
+   * Specifies that two following pages should be printed on the
    * front and back of one sheet for binding on the short edge.
    */
   public static final Sides TWO_SIDED_SHORT_EDGE = new Sides(2);
-  
-  /** 
-   * An alias constant for "two sided long edge". 
+
+  /**
+   * An alias constant for "two sided long edge".
    */
   public static final Sides DUPLEX = new Sides(1);
-  
-  /** 
-   * An alias constant for "two sided short edge". 
+
+  /**
+   * An alias constant for "two sided short edge".
    */
   public static final Sides TUMBLE = new Sides(2);
 
-  private static final String[] stringTable = { "one-sided", 
+  private static final String[] stringTable = { "one-sided",
                                                 "two-sided-long-edge",
                                                 "two-sided-short-edge" };
-  
-  private static final Sides[] enumValueTable = { ONE_SIDED, 
-                                                  TWO_SIDED_LONG_EDGE, 
-                                                  TWO_SIDED_SHORT_EDGE };  
-  
+
+  private static final Sides[] enumValueTable = { ONE_SIDED,
+                                                  TWO_SIDED_LONG_EDGE,
+                                                  TWO_SIDED_SHORT_EDGE };
+
   /**
    * Creates a <code>Sides</code> object.
    *
@@ -123,7 +123,7 @@ public final class Sides extends EnumSyntax
   {
     return "sides";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/javax/print/event/PrintEvent.java b/javax/print/event/PrintEvent.java
index d44c20668..4eaedceb6 100644
--- a/javax/print/event/PrintEvent.java
+++ b/javax/print/event/PrintEvent.java
@@ -1,4 +1,4 @@
-/* PrintEvent.java -- 
+/* PrintEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,14 +42,14 @@ import java.util.EventObject;
 
 /**
  * Superclass of all events in the Java Print Service API.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintEvent extends EventObject
 {
   /**
    * Constructs a <code>PrintEvent</code> object.
-   * 
+   *
    * @param source the source of this event
    */
   public PrintEvent(Object source)
@@ -59,7 +59,7 @@ public class PrintEvent extends EventObject
 
   /**
    * Returns a string representation of this object.
-   * 
+   *
    * @return The string representation
    */
   public String toString()
diff --git a/javax/print/event/PrintJobAdapter.java b/javax/print/event/PrintJobAdapter.java
index 9229d195f..e8e71008e 100644
--- a/javax/print/event/PrintJobAdapter.java
+++ b/javax/print/event/PrintJobAdapter.java
@@ -1,4 +1,4 @@
-/* PrintJobAdapter.java -- 
+/* PrintJobAdapter.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,7 +43,7 @@ package javax.print.event;
  * classes. The methods in this class do nothing by default. Subclasses may
  * only implement the methods for the {@link javax.print.event.PrintJobEvent}s
  * they are interested in.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class PrintJobAdapter
@@ -56,13 +56,13 @@ public abstract class PrintJobAdapter
   {
     // Do nothing here.
   }
-  
+
   /**
    * Called to notify the client that all data has been successfully transferred
    * to the print service.
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printDataTransferCompleted(PrintJobEvent event)
   {
@@ -70,10 +70,10 @@ public abstract class PrintJobAdapter
   }
 
   /**
-   * Called to notify the client that a print job was canceled. 
+   * Called to notify the client that a print job was canceled.
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobCanceled(PrintJobEvent event)
   {
@@ -83,8 +83,8 @@ public abstract class PrintJobAdapter
   /**
    * Called to notify the client that a print job was successfully completed.
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobCompleted(PrintJobEvent event)
   {
@@ -95,8 +95,8 @@ public abstract class PrintJobAdapter
    * Called to notify the client that a print job failed to complete
    * successfully.
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobFailed(PrintJobEvent event)
   {
@@ -106,8 +106,8 @@ public abstract class PrintJobAdapter
   /**
    * Called to notify the client that no more job events will be send.
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobNoMoreEvents(PrintJobEvent event)
   {
@@ -116,11 +116,11 @@ public abstract class PrintJobAdapter
 
   /**
    * Called to notify the client that a problem occured during printing.
-   * This event signals problems a user might be able to fix 
+   * This event signals problems a user might be able to fix
    * (e.g. out of paper or paper jam).
    * <p>The default implementation does nothing.</p>
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobRequiresAttention(PrintJobEvent event)
   {
diff --git a/javax/print/event/PrintJobAttributeEvent.java b/javax/print/event/PrintJobAttributeEvent.java
index d401ab151..dd242e8e6 100644
--- a/javax/print/event/PrintJobAttributeEvent.java
+++ b/javax/print/event/PrintJobAttributeEvent.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeEvent.java -- 
+/* PrintJobAttributeEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,21 +42,21 @@ import javax.print.attribute.PrintJobAttributeSet;
 
 
 /**
- * <code>PrintJobAttributeEvent</code>s are generated by a 
+ * <code>PrintJobAttributeEvent</code>s are generated by a
  * <code>PrintService</code> to inform registered listeners that attributes
  * associated with a {@link javax.print.DocPrintJob} instance have changed.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintJobAttributeEvent extends PrintEvent
 {
   private static final long serialVersionUID = -6534469883874742101L;
-  
+
   private PrintJobAttributeSet attributes;
-  
+
   /**
    * Constructs a <code>PrintJobAttributeEvent</code> object.
-   * 
+   *
    * @param source the source of this event
    * @param attributes the attribute changes being reported
    */
@@ -69,7 +69,7 @@ public class PrintJobAttributeEvent extends PrintEvent
 
   /**
    * Returns the print job generating this event.
-   * 
+   *
    * @return The print job.
    */
   public DocPrintJob getPrintJob()
@@ -79,7 +79,7 @@ public class PrintJobAttributeEvent extends PrintEvent
 
   /**
    * Returns the attributes that changed and their new values.
-   * 
+   *
    * @return The changed attributes.
    */
   public PrintJobAttributeSet getAttributes()
diff --git a/javax/print/event/PrintJobAttributeListener.java b/javax/print/event/PrintJobAttributeListener.java
index 9f96d267e..bd2ea2695 100644
--- a/javax/print/event/PrintJobAttributeListener.java
+++ b/javax/print/event/PrintJobAttributeListener.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeListener.java -- 
+/* PrintJobAttributeListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,16 +40,16 @@ package javax.print.event;
 
 /**
  * Listener interface to receive attribute changes from a print job.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.DocPrintJob} instance.
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttributeListener
 {
   /**
    * Notifies the listener of an attribute change.
-   * 
+   *
    * @param event the event
    */
   void attributeUpdate(PrintJobAttributeEvent event);
diff --git a/javax/print/event/PrintJobEvent.java b/javax/print/event/PrintJobEvent.java
index cc15f9753..db885648c 100644
--- a/javax/print/event/PrintJobEvent.java
+++ b/javax/print/event/PrintJobEvent.java
@@ -1,4 +1,4 @@
-/* PrintEvent.java -- 
+/* PrintEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,40 +44,40 @@ import javax.print.DocPrintJob;
  * <code>PrintJobEvent</code>s are generated by a print job during
  * print job processing to inform registered listeners about the state
  * of processing.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintJobEvent extends PrintEvent
 {
   private static final long serialVersionUID = -1711656903622072997L;
-  
+
   /** Indicates that the data transfer to the print service has completed. */
   public static final int DATA_TRANSFER_COMPLETE = 106;
-  
+
   /** Indicates that the print job was canceled. */
   public static final int JOB_CANCELED = 101;
-  
+
   /** Indicates that the print job was completed (=printed). */
   public static final int JOB_COMPLETE = 102;
-  
+
   /** Indicates that the print job failed to complete. */
   public static final int JOB_FAILED = 103;
-  
+
   /** Indicates that no more job events will be send.*/
   public static final int NO_MORE_EVENTS = 105;
-  
-  /** 
+
+  /**
    * Indicates a situation where human intervention might be needed.
    * E.g. the printer run out of paper or a paper jam occured.
    */
   public static final int REQUIRES_ATTENTION = 104;
-  
+
   /** The reason (one of the defined constants). */
   private int reason;
-  
+
   /**
    * Constructs a <code>PrintJobEvent</code> object.
-   * 
+   *
    * @param source the source generating this event
    * @param reason the reason for this event
    */
@@ -89,7 +89,7 @@ public class PrintJobEvent extends PrintEvent
 
   /**
    * Returns the reason for this event.
-   * 
+   *
    * @return The reason.
    */
   public int getPrintEventType()
@@ -99,9 +99,9 @@ public class PrintJobEvent extends PrintEvent
 
   /**
    * Returns the print job that generated this event.
-   * 
+   *
    * @return The print job.
-   */ 
+   */
   public DocPrintJob getPrintJob()
   {
     return (DocPrintJob) getSource();
diff --git a/javax/print/event/PrintJobListener.java b/javax/print/event/PrintJobListener.java
index 96c6d411d..8ac1a0143 100644
--- a/javax/print/event/PrintJobListener.java
+++ b/javax/print/event/PrintJobListener.java
@@ -1,4 +1,4 @@
-/* PrintJobListener.java -- 
+/* PrintJobListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,56 +40,56 @@ package javax.print.event;
 
 /**
  * Listener interface to receive processing events from a print job.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.DocPrintJob} instance.
- * 
+ *
  * @see javax.print.event.PrintJobAdapter
- *  
- * @author Michael Koch (konqueror@gmx.de) 
+ *
+ * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobListener
 {
   /**
    * Notifies the listener that all data has been successfully transferred
    * to the print service.
-   * 
+   *
    * @param event the event
    */
   void printDataTransferCompleted(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job got canceled.
-   * 
+   *
    * @param event the event
    */
   void printJobCanceled(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job has completed.
-   * 
+   *
    * @param event the event
    */
   void printJobCompleted(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job has failed to complete.
-   * 
+   *
    * @param event the event.
    */
   void printJobFailed(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that no more events will be delivered.
-   * 
+   *
    * @param event the event
    */
   void printJobNoMoreEvents(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a problem occured during printing.
-   * This event signals problems a user might be able to fix 
+   * This event signals problems a user might be able to fix
    * (e.g. out of paper or paper jam).
-   * 
+   *
    * @param event the event
    */
   void printJobRequiresAttention(PrintJobEvent event);
diff --git a/javax/print/event/PrintServiceAttributeEvent.java b/javax/print/event/PrintServiceAttributeEvent.java
index a41e213ff..665db52bf 100644
--- a/javax/print/event/PrintServiceAttributeEvent.java
+++ b/javax/print/event/PrintServiceAttributeEvent.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeEvent.java -- 
+/* PrintServiceAttributeEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,19 +42,19 @@ import javax.print.attribute.PrintServiceAttributeSet;
 
 
 /**
- * <code>PrintServiceAttributeEvent</code>s are generated by a 
+ * <code>PrintServiceAttributeEvent</code>s are generated by a
  * <code>PrintService</code> to inform registered listeners that
  * its associated attributes have changed.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintServiceAttributeEvent extends PrintEvent
 {
   private PrintServiceAttributeSet attributes;
-  
+
   /**
    * Constructs a <code>PrintServiceAttributeEvent</code> object.
-   * 
+   *
    * @param source the source of this event
    * @param attributes the attribute changes being reported
    */
@@ -67,7 +67,7 @@ public class PrintServiceAttributeEvent extends PrintEvent
 
   /**
    * Returns the print service that generated this event.
-   * 
+   *
    * @return The print service.
    */
   public PrintService getPrintService()
@@ -77,7 +77,7 @@ public class PrintServiceAttributeEvent extends PrintEvent
 
   /**
    * Returns the changed attributes this event reports.
-   * 
+   *
    * @return The changed attributes.
    */
   public PrintServiceAttributeSet getAttributes()
diff --git a/javax/print/event/PrintServiceAttributeListener.java b/javax/print/event/PrintServiceAttributeListener.java
index b46bf3b69..596d1675e 100644
--- a/javax/print/event/PrintServiceAttributeListener.java
+++ b/javax/print/event/PrintServiceAttributeListener.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeListener.java -- 
+/* PrintServiceAttributeListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,16 +40,16 @@ package javax.print.event;
 
 /**
  * Listener interface to receive attribute changes from a print service.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.PrintService} instance.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttributeListener
 {
   /**
    * Notifies the listener that some attributes have changed.
-   * 
+   *
    * @param event the event
    */
   void attributeUpdate(PrintServiceAttributeEvent event);
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 /javax/print
parent	43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download	classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz