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/

1 files changed, 106 insertions, 106 deletions

diff --git a/java/util/zip/ZipOutputStream.java b/java/util/zip/ZipOutputStream.java
index d292f7d40..bc1c3e99c 100644
--- a/java/util/zip/ZipOutputStream.java
+++ b/java/util/zip/ZipOutputStream.java
@@ -54,7 +54,7 @@ import java.util.Vector;
  *
  * This class is not thread safe.
  *
- * @author Jochen Hoenicke 
+ * @author Jochen Hoenicke
  */
 public class ZipOutputStream extends DeflaterOutputStream implements ZipConstants
 {
@@ -79,7 +79,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
    * Compression method.  This method doesn't compress at all.
    */
   public static final int STORED = 0;
-  
+
   /**
    * Compression method.  This method uses the Deflater.
    */
@@ -105,17 +105,17 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     byte[] commentBytes;
     try
       {
-	commentBytes = comment.getBytes("UTF-8");
+        commentBytes = comment.getBytes("UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-	throw new AssertionError(uee);
+        throw new AssertionError(uee);
       }
     if (commentBytes.length > 0xffff)
       throw new IllegalArgumentException("Comment too long.");
     zipComment = commentBytes;
   }
-  
+
   /**
    * Sets default compression method.  If the Zip entry specifies
    * another method its method takes precedence.
@@ -133,7 +133,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
   /**
    * Sets default compression level.  The new level will be activated
-   * immediately.  
+   * immediately.
    * @exception IllegalArgumentException if level is not supported.
    * @see Deflater
    */
@@ -141,11 +141,11 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
   {
     def.setLevel(level);
   }
-  
+
   /**
    * Write an unsigned short in little endian byte order.
    */
-  private void writeLeShort(int value) throws IOException 
+  private void writeLeShort(int value) throws IOException
   {
     out.write(value & 0xff);
     out.write((value >> 8) & 0xff);
@@ -154,7 +154,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
   /**
    * Write an int in little endian byte order.
    */
-  private void writeLeInt(int value) throws IOException 
+  private void writeLeInt(int value) throws IOException
   {
     writeLeShort(value);
     writeLeShort(value >> 16);
@@ -192,27 +192,27 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
     if (method == STORED)
       {
-	if (entry.getCompressedSize() >= 0)
-	  {
-	    if (entry.getSize() < 0)
-	      entry.setSize(entry.getCompressedSize());
-	    else if (entry.getSize() != entry.getCompressedSize())
-	      throw new ZipException
-		("Method STORED, but compressed size != size");
-	  }
-	else
-	  entry.setCompressedSize(entry.getSize());
-
-	if (entry.getSize() < 0)
-	  throw new ZipException("Method STORED, but size not set");
-	if (entry.getCrc() < 0)
-	  throw new ZipException("Method STORED, but crc not set");
+        if (entry.getCompressedSize() >= 0)
+          {
+            if (entry.getSize() < 0)
+              entry.setSize(entry.getCompressedSize());
+            else if (entry.getSize() != entry.getCompressedSize())
+              throw new ZipException
+                ("Method STORED, but compressed size != size");
+          }
+        else
+          entry.setCompressedSize(entry.getSize());
+
+        if (entry.getSize() < 0)
+          throw new ZipException("Method STORED, but size not set");
+        if (entry.getCrc() < 0)
+          throw new ZipException("Method STORED, but crc not set");
       }
     else if (method == DEFLATED)
       {
-	if (entry.getCompressedSize() < 0
-	    || entry.getSize() < 0 || entry.getCrc() < 0)
-	  flags |= 8;
+        if (entry.getCompressedSize() < 0
+            || entry.getSize() < 0 || entry.getCrc() < 0)
+          flags |= 8;
       }
 
     if (curEntry != null)
@@ -228,30 +228,30 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     /* Write the local file header */
     writeLeInt(LOCSIG);
     writeLeShort(method == STORED
-		 ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+                 ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
     writeLeShort(flags);
     writeLeShort(method);
     writeLeInt(entry.getDOSTime());
     if ((flags & 8) == 0)
       {
-	writeLeInt((int)entry.getCrc());
-	writeLeInt((int)entry.getCompressedSize());
-	writeLeInt((int)entry.getSize());
+        writeLeInt((int)entry.getCrc());
+        writeLeInt((int)entry.getCompressedSize());
+        writeLeInt((int)entry.getSize());
       }
     else
       {
-	writeLeInt(0);
-	writeLeInt(0);
-	writeLeInt(0);
+        writeLeInt(0);
+        writeLeInt(0);
+        writeLeInt(0);
       }
     byte[] name;
     try
       {
-	name = entry.getName().getBytes("UTF-8");
+        name = entry.getName().getBytes("UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-	throw new AssertionError(uee);
+        throw new AssertionError(uee);
       }
     if (name.length > 0xffff)
       throw new ZipException("Name too long.");
@@ -294,31 +294,31 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
       curEntry.setSize(size);
     else if (curEntry.getSize() != size)
       throw new ZipException("size was "+size
-			     +", but I expected "+curEntry.getSize());
+                             +", but I expected "+curEntry.getSize());
 
     if (curEntry.getCompressedSize() < 0)
       curEntry.setCompressedSize(csize);
     else if (curEntry.getCompressedSize() != csize)
       throw new ZipException("compressed size was "+csize
-			     +", but I expected "+curEntry.getSize());
+                             +", but I expected "+curEntry.getSize());
 
     if (curEntry.getCrc() < 0)
       curEntry.setCrc(crc.getValue());
     else if (curEntry.getCrc() != crc.getValue())
       throw new ZipException("crc was " + Long.toHexString(crc.getValue())
-			     + ", but I expected " 
-			     + Long.toHexString(curEntry.getCrc()));
+                             + ", but I expected "
+                             + Long.toHexString(curEntry.getCrc()));
 
     offset += csize;
 
     /* Now write the data descriptor entry if needed. */
     if (curMethod == DEFLATED && (curEntry.flags & 8) != 0)
       {
-	writeLeInt(EXTSIG);
-	writeLeInt((int)curEntry.getCrc());
-	writeLeInt((int)curEntry.getCompressedSize());
-	writeLeInt((int)curEntry.getSize());
-	offset += EXTHDR;
+        writeLeInt(EXTSIG);
+        writeLeInt((int)curEntry.getCrc());
+        writeLeInt((int)curEntry.getCompressedSize());
+        writeLeInt((int)curEntry.getSize());
+        offset += EXTHDR;
       }
 
     entries.addElement(curEntry);
@@ -338,12 +338,12 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     switch (curMethod)
       {
       case DEFLATED:
-	super.write(b, off, len);
-	break;
-	
+        super.write(b, off, len);
+        break;
+
       case STORED:
-	out.write(b, off, len);
-	break;
+        out.write(b, off, len);
+        break;
       }
 
     crc.update(b, off, len);
@@ -364,65 +364,65 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
     int numEntries = 0;
     int sizeEntries = 0;
-    
+
     Enumeration e = entries.elements();
     while (e.hasMoreElements())
       {
-	ZipEntry entry = (ZipEntry) e.nextElement();
-	
-	int method = entry.getMethod();
-	writeLeInt(CENSIG);
-	writeLeShort(method == STORED
-		     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
-	writeLeShort(method == STORED
-		     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
-	writeLeShort(entry.flags);
-	writeLeShort(method);
-	writeLeInt(entry.getDOSTime());
-	writeLeInt((int)entry.getCrc());
-	writeLeInt((int)entry.getCompressedSize());
-	writeLeInt((int)entry.getSize());
-
-	byte[] name;
-	try
-	  {
-	    name = entry.getName().getBytes("UTF-8");
-	  }
-	catch (UnsupportedEncodingException uee)
-	  {
-	    throw new AssertionError(uee);
-	  }
-	if (name.length > 0xffff)
-	  throw new ZipException("Name too long.");
-	byte[] extra = entry.getExtra();
-	if (extra == null)
-	  extra = new byte[0];
-	String str = entry.getComment();
-	byte[] comment;
-	try
-	  {
-	    comment = str != null ? str.getBytes("UTF-8") : new byte[0];
-	  }
-	catch (UnsupportedEncodingException uee)
-	  {
-	    throw new AssertionError(uee);
-	  }
-	if (comment.length > 0xffff)
-	  throw new ZipException("Comment too long.");
-
-	writeLeShort(name.length);
-	writeLeShort(extra.length);
-	writeLeShort(comment.length);
-	writeLeShort(0); /* disk number */
-	writeLeShort(0); /* internal file attr */
-	writeLeInt(0);   /* external file attr */
-	writeLeInt(entry.offset);
-
-	out.write(name);
-	out.write(extra);
-	out.write(comment);
-	numEntries++;
-	sizeEntries += CENHDR + name.length + extra.length + comment.length;
+        ZipEntry entry = (ZipEntry) e.nextElement();
+
+        int method = entry.getMethod();
+        writeLeInt(CENSIG);
+        writeLeShort(method == STORED
+                     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+        writeLeShort(method == STORED
+                     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+        writeLeShort(entry.flags);
+        writeLeShort(method);
+        writeLeInt(entry.getDOSTime());
+        writeLeInt((int)entry.getCrc());
+        writeLeInt((int)entry.getCompressedSize());
+        writeLeInt((int)entry.getSize());
+
+        byte[] name;
+        try
+          {
+            name = entry.getName().getBytes("UTF-8");
+          }
+        catch (UnsupportedEncodingException uee)
+          {
+            throw new AssertionError(uee);
+          }
+        if (name.length > 0xffff)
+          throw new ZipException("Name too long.");
+        byte[] extra = entry.getExtra();
+        if (extra == null)
+          extra = new byte[0];
+        String str = entry.getComment();
+        byte[] comment;
+        try
+          {
+            comment = str != null ? str.getBytes("UTF-8") : new byte[0];
+          }
+        catch (UnsupportedEncodingException uee)
+          {
+            throw new AssertionError(uee);
+          }
+        if (comment.length > 0xffff)
+          throw new ZipException("Comment too long.");
+
+        writeLeShort(name.length);
+        writeLeShort(extra.length);
+        writeLeShort(comment.length);
+        writeLeShort(0); /* disk number */
+        writeLeShort(0); /* internal file attr */
+        writeLeInt(0);   /* external file attr */
+        writeLeInt(entry.offset);
+
+        out.write(name);
+        out.write(extra);
+        out.write(comment);
+        numEntries++;
+        sizeEntries += CENHDR + name.length + extra.length + comment.length;
       }
 
     writeLeInt(ENDSIG);