From a17284098845d59d84bbf76b33190a5a91c12a82 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 3 Jun 2010 19:11:10 +0000 Subject: Normalise whitespace. 2010-06-03 Andrew John Hughes * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java, * examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Player.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java, * examples/gnu/classpath/examples/CORBA/swing/x5/State.java, * examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java, * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java, * examples/gnu/classpath/examples/awt/Demo.java, * examples/gnu/classpath/examples/awt/HintingDemo.java, * examples/gnu/classpath/examples/datatransfer/Demo.java, * examples/gnu/classpath/examples/html/Demo.java, * examples/gnu/classpath/examples/java2d/J2dBenchmark.java, * examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java, * examples/gnu/classpath/examples/java2d/JNIOverhead.java, * examples/gnu/classpath/examples/jawt/DemoJAWT.java, * examples/gnu/classpath/examples/management/TestClassLoading.java, * examples/gnu/classpath/examples/management/TestCompilation.java, * examples/gnu/classpath/examples/management/TestGarbageCollector.java, * examples/gnu/classpath/examples/management/TestMemory.java, * examples/gnu/classpath/examples/management/TestMemoryManager.java, * examples/gnu/classpath/examples/management/TestMemoryPool.java, * examples/gnu/classpath/examples/management/TestThread.java, * examples/gnu/classpath/examples/midi/Demo.java, * examples/gnu/classpath/examples/print/Demo.java, * examples/gnu/classpath/examples/sound/AudioPlayerSample.java, * examples/gnu/classpath/examples/swing/BrowserEditorKit.java, * examples/gnu/classpath/examples/swing/ButtonDemo.java, * examples/gnu/classpath/examples/swing/ComboBoxDemo.java, * examples/gnu/classpath/examples/swing/Demo.java, * examples/gnu/classpath/examples/swing/DemoFactory.java, * examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, * examples/gnu/classpath/examples/swing/FileChooserDemo.java, * examples/gnu/classpath/examples/swing/HtmlDemo.java, * examples/gnu/classpath/examples/swing/ListDemo.java, * examples/gnu/classpath/examples/swing/MetalThemeEditor.java, * examples/gnu/classpath/examples/swing/NavigationFilterDemo.java, * examples/gnu/classpath/examples/swing/ScrollBarDemo.java, * examples/gnu/classpath/examples/swing/SliderDemo.java, * examples/gnu/classpath/examples/swing/SpinnerDemo.java, * examples/gnu/classpath/examples/swing/TabbedPaneDemo.java, * examples/gnu/classpath/examples/swing/TableDemo.java, * examples/gnu/classpath/examples/swing/TextAreaDemo.java, * examples/gnu/classpath/examples/swing/TextFieldDemo.java, * examples/gnu/classpath/examples/swing/TreeDemo.java, * 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/ --- vm/reference/gnu/java/lang/VMCPStringBuilder.java | 34 ++-- .../gnu/java/lang/VMInstrumentationImpl.java | 22 +-- .../lang/management/VMClassLoadingMXBeanImpl.java | 2 +- .../lang/management/VMCompilationMXBeanImpl.java | 2 +- .../management/VMGarbageCollectorMXBeanImpl.java | 2 +- .../java/lang/management/VMMemoryMXBeanImpl.java | 46 ++--- .../lang/management/VMMemoryManagerMXBeanImpl.java | 20 +-- .../lang/management/VMMemoryPoolMXBeanImpl.java | 10 +- .../java/lang/management/VMThreadMXBeanImpl.java | 18 +- .../gnu/java/net/VMPlainDatagramSocketImpl.java | 10 +- vm/reference/gnu/java/net/VMPlainSocketImpl.java | 97 ++++++----- vm/reference/gnu/java/nio/VMChannel.java | 186 ++++++++++----------- vm/reference/gnu/java/nio/VMPipe.java | 4 +- vm/reference/gnu/java/nio/VMSelector.java | 4 +- .../gnu/java/security/jce/prng/VMSecureRandom.java | 2 +- 15 files changed, 229 insertions(+), 230 deletions(-) (limited to 'vm/reference/gnu/java') diff --git a/vm/reference/gnu/java/lang/VMCPStringBuilder.java b/vm/reference/gnu/java/lang/VMCPStringBuilder.java index 8e137cd3f..c3a3784f3 100644 --- a/vm/reference/gnu/java/lang/VMCPStringBuilder.java +++ b/vm/reference/gnu/java/lang/VMCPStringBuilder.java @@ -59,16 +59,16 @@ final class VMCPStringBuilder { try { - cons = String.class.getDeclaredConstructor(new Class[] { char[].class, - Integer.TYPE, - Integer.TYPE, - Boolean.TYPE }); - cons.setAccessible(true); + cons = String.class.getDeclaredConstructor(new Class[] { char[].class, + Integer.TYPE, + Integer.TYPE, + Boolean.TYPE }); + cons.setAccessible(true); } catch (NoSuchMethodException e) { - throw (Error) - new InternalError("Could not get no-copy String constructor").initCause(e); + throw (Error) + new InternalError("Could not get no-copy String constructor").initCause(e); } } @@ -87,25 +87,25 @@ final class VMCPStringBuilder { try { - return (String) - cons.newInstance(new Object[] { value, Integer.valueOf(startIndex), - Integer.valueOf(count), - Boolean.valueOf(true) }); + return (String) + cons.newInstance(new Object[] { value, Integer.valueOf(startIndex), + Integer.valueOf(count), + Boolean.valueOf(true) }); } catch (InstantiationException e) { - throw (Error) - new InternalError("Could not instantiate no-copy String constructor").initCause(e); + throw (Error) + new InternalError("Could not instantiate no-copy String constructor").initCause(e); } catch (IllegalAccessException e) { - throw (Error) - new InternalError("Could not access no-copy String constructor").initCause(e); + throw (Error) + new InternalError("Could not access no-copy String constructor").initCause(e); } catch (InvocationTargetException e) { - throw (Error) - new InternalError("Error calling no-copy String constructor").initCause(e); + throw (Error) + new InternalError("Error calling no-copy String constructor").initCause(e); } } diff --git a/vm/reference/gnu/java/lang/VMInstrumentationImpl.java b/vm/reference/gnu/java/lang/VMInstrumentationImpl.java index eee94702d..5501f0f7f 100644 --- a/vm/reference/gnu/java/lang/VMInstrumentationImpl.java +++ b/vm/reference/gnu/java/lang/VMInstrumentationImpl.java @@ -48,14 +48,14 @@ import java.lang.instrument.Instrumentation; */ final class VMInstrumentationImpl { - + /** * Returns if the current JVM supports class redefinition - * + * * @return true if the current JVM supports class redefinition */ static native boolean isRedefineClassesSupported(); - + /** * Redefines classes given as parameters. The method has to call * the callTransformers from InstrumentationImpl @@ -63,8 +63,8 @@ final class VMInstrumentationImpl * @param inst an instrumentation object * @param definitions an array of bytecode<->class correspondance * - * @throws ClassNotFoundException if a class cannot be found - * @throws UnmodifiableClassException if a class cannot be modified + * @throws ClassNotFoundException if a class cannot be found + * @throws UnmodifiableClassException if a class cannot be modified * @throws UnsupportedOperationException if the JVM does not support * redefinition or the redefinition made unsupported changes * @throws ClassFormatError if a class file is not valid @@ -74,14 +74,14 @@ final class VMInstrumentationImpl * are unsupported * @throws ClassCircularityError if circularity occured with the new * classes - * @throws LinkageError if a linkage error occurs + * @throws LinkageError if a linkage error occurs */ static native void redefineClasses(Instrumentation inst, ClassDefinition[] definitions); - + /** * Get all the classes loaded by the JVM. - * + * * @return an array containing all the classes loaded by the JVM. The array * is empty if no class is loaded. */ @@ -89,9 +89,9 @@ final class VMInstrumentationImpl /** * Get all the classes loaded by a given class loader - * + * * @param loader the loader - * + * * @return an array containing all the classes loaded by the given loader. * The array is empty if no class was loaded by the loader. */ @@ -99,7 +99,7 @@ final class VMInstrumentationImpl /** * Get the size of an object. The object is not null - * + * * @param objectToSize the object * @return the size of the object */ diff --git a/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java index c1c7d13dd..ea4989741 100644 --- a/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java @@ -38,7 +38,7 @@ exception statement from your version. */ package gnu.java.lang.management; /** - * Provides access to information about the class loading + * Provides access to information about the class loading * behaviour of the current invocation of the virtual * machine. Instances of this bean are obtained by calling * {@link ManagementFactory#getClassLoadingMXBean()}. diff --git a/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java index b9b5bbcef..019af0ca4 100644 --- a/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java @@ -38,7 +38,7 @@ exception statement from your version. */ package gnu.java.lang.management; /** - * Provides access to information about the JIT + * Provides access to information about the JIT * compiler of the virtual machine, if one exists. * Instances of this bean are obtained by calling * {@link ManagementFactory#getCompilationMXBean()}, diff --git a/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java index 2a202849a..00861bc21 100644 --- a/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java @@ -70,7 +70,7 @@ final class VMGarbageCollectorMXBeanImpl * Note that the accumulated time may not change, even when the * collection count increases, if the time taken is sufficiently * short; this depends on the resolution of the timer used. - * + * * @param name the name of the garbage collector. * @return the accumulated number of milliseconds spent collecting, * or -1 if this is undefined. diff --git a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java index eade26374..7f69bdfb7 100644 --- a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java @@ -126,29 +126,29 @@ final class VMMemoryMXBeanImpl ManagementFactory.getMemoryPoolMXBeans().iterator(); while (pools.hasNext()) { - MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next(); - if (pool.getType() == type) - { - MemoryUsage usage = pool.getUsage(); - if (init != -1) - { - long poolInit = usage.getInit(); - if (poolInit == -1) - init = -1; - else - init += poolInit; - } - committed += usage.getCommitted(); - used += usage.getUsed(); - if (max != -1) - { - long poolMax = usage.getMax(); - if (poolMax == -1) - max = -1; - else - max += poolMax; - } - } + MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next(); + if (pool.getType() == type) + { + MemoryUsage usage = pool.getUsage(); + if (init != -1) + { + long poolInit = usage.getInit(); + if (poolInit == -1) + init = -1; + else + init += poolInit; + } + committed += usage.getCommitted(); + used += usage.getUsed(); + if (max != -1) + { + long poolMax = usage.getMax(); + if (poolMax == -1) + max = -1; + else + max += poolMax; + } + } } return new MemoryUsage(init, used, committed, max); } diff --git a/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java index 0a4204a6d..477329f0a 100644 --- a/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java @@ -56,10 +56,10 @@ import java.util.List; final class VMMemoryManagerMXBeanImpl { - /** + /** * Returns an array containing the names of the memory pools * this memory manager manages. - * + * * @param name the name of the memory manager. * @return an array containing the name of each memory pool * this manager is responsible for. @@ -70,14 +70,14 @@ final class VMMemoryManagerMXBeanImpl Iterator beans = ManagementFactory.getMemoryPoolMXBeans().iterator(); while (beans.hasNext()) { - MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); - String[] managers = bean.getMemoryManagerNames(); - for (int a = 0; a < managers.length; ++a) - if (managers[a].equals(name)) - { - managedPools.add(bean.getName()); - break; - } + MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); + String[] managers = bean.getMemoryManagerNames(); + for (int a = 0; a < managers.length; ++a) + if (managers[a].equals(name)) + { + managedPools.add(bean.getName()); + break; + } } return (String[]) managedPools.toArray(new String[managedPools.size()]); } diff --git a/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java index 723d4e897..36cd2586a 100644 --- a/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java @@ -106,7 +106,7 @@ final class VMMemoryPoolMXBeanImpl static native MemoryUsage getPeakUsage(String name); /** - * Returns the type of memory used by the specified pool. + * Returns the type of memory used by the specified pool. * The value must be either "HEAP" or "NON_HEAP". * * @param name the name of the pool to obtain statistics on. @@ -149,7 +149,7 @@ final class VMMemoryPoolMXBeanImpl * @return the usage threshold count. */ static native long getUsageThresholdCount(String name); - + /** * Returns true if the specified pool is still valid i.e. * it is still in use by the virtual machine. @@ -158,7 +158,7 @@ final class VMMemoryPoolMXBeanImpl * @return true if the pool is valid. */ static native boolean isValid(String name); - + /** * Resets the peak usage level to the current usage level for * the specified pool. @@ -173,7 +173,7 @@ final class VMMemoryPoolMXBeanImpl * This is only called if this functionality is supported * by the virtual machine (i.e. the appropriate property, * gnu.java.lang.management.CollectionUsageThresholdSupport, - * is defined). + * is defined). * * @param name the name of the pool to set the threshold of. * @param threshold the new threshold level. @@ -185,7 +185,7 @@ final class VMMemoryPoolMXBeanImpl * This is only called if this functionality is supported * by the virtual machine (i.e. the appropriate property, * gnu.java.lang.management.UsageThresholdSupport, - * is defined). + * is defined). * * @param name the name of the pool to set the threshold of. * @param threshold the new threshold level. diff --git a/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java index 1c061aa93..33448d9d5 100644 --- a/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java +++ b/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java @@ -40,7 +40,7 @@ package gnu.java.lang.management; import java.lang.management.ThreadInfo; /** - * Provides access to information about the threads + * Provides access to information about the threads * of the virtual machine. An instance of this bean is * obtained by calling * {@link ManagementFactory#getThreadMXBean()}. @@ -87,13 +87,13 @@ final class VMThreadMXBeanImpl filled = group.enumerate(threadList); while (filled == arraySize) { - arraySize *= 2; - threadList = new Thread[arraySize]; - filled = group.enumerate(threadList); + arraySize *= 2; + threadList = new Thread[arraySize]; + filled = group.enumerate(threadList); } return threadList; } - + /** * Returns the id of all live threads at the time of execution. * @@ -141,8 +141,8 @@ final class VMThreadMXBeanImpl int daemonCount = 0; for (int a = 0; a < filled; ++a) { - if (threadList[a].isDaemon()) - ++daemonCount; + if (threadList[a].isDaemon()) + ++daemonCount; } return daemonCount; } @@ -205,7 +205,7 @@ final class VMThreadMXBeanImpl * @return the corresponding ThreadInfo. */ static native ThreadInfo getThreadInfoForId(long id, int maxDepth); - + /** * Returns the number of nanoseconds of user time * the specified thread has used in total. This is @@ -217,7 +217,7 @@ final class VMThreadMXBeanImpl * the thread. */ static native long getThreadUserTime(long id); - + /** * Returns the total number of threads that have * been started over the lifetime of the virtual diff --git a/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java b/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java index 958c21874..da0f893cf 100644 --- a/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java +++ b/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -69,7 +69,7 @@ public final class VMPlainDatagramSocketImpl System.loadLibrary("javanet"); } } - + /** * Binds this socket to a particular port and interface * @@ -78,9 +78,9 @@ public final class VMPlainDatagramSocketImpl * @param addr the address to bind to * * @throws SocketException If an error occurs - */ + */ static native void bind(PlainDatagramSocketImpl socket, int port, - InetAddress addr) + InetAddress addr) throws SocketException; /** @@ -127,7 +127,7 @@ public final class VMPlainDatagramSocketImpl * * @param socket the socket object * @param addr the address to send to - * @param port the port to send to + * @param port the port to send to * @param buf the buffer to send * @param offset the offset of the data in the buffer to send * @param len the length of the data to send diff --git a/vm/reference/gnu/java/net/VMPlainSocketImpl.java b/vm/reference/gnu/java/net/VMPlainSocketImpl.java index 916f95930..c72e6a5eb 100644 --- a/vm/reference/gnu/java/net/VMPlainSocketImpl.java +++ b/vm/reference/gnu/java/net/VMPlainSocketImpl.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -62,7 +62,7 @@ public final class VMPlainSocketImpl private static final int CP_IP_TTL = 0x1E61; private final State nfd; - + /** * Static initializer to load native library. */ @@ -73,19 +73,19 @@ public final class VMPlainSocketImpl System.loadLibrary("javanet"); } } - + public VMPlainSocketImpl() { // XXX consider adding security check here. nfd = new State(); } - + public VMPlainSocketImpl(VMChannel channel) throws IOException { this(); nfd.setChannelFD(channel.getState()); } - + public State getState() { return nfd; @@ -144,7 +144,7 @@ public final class VMPlainSocketImpl else throw new IllegalArgumentException("option value type " + optionValue.getClass().getName()); - + try { setOption(nfd.getNativeFD(), optionId, value); @@ -156,7 +156,7 @@ public final class VMPlainSocketImpl throw se; } } - + private static native void setOption(int fd, int id, int value) throws SocketException; @@ -198,16 +198,16 @@ public final class VMPlainSocketImpl /** * Get a socket option. This implementation is only required to support * socket options that are boolean values, which include: - * + * * SocketOptions.IP_MULTICAST_LOOP * SocketOptions.SO_BROADCAST * SocketOptions.SO_KEEPALIVE * SocketOptions.SO_OOBINLINE * SocketOptions.SO_REUSEADDR * SocketOptions.TCP_NODELAY - * + * * and socket options that are integer values, which include: - * + * * SocketOptions.IP_TOS * SocketOptions.SO_LINGER * SocketOptions.SO_RCVBUF @@ -232,7 +232,7 @@ public final class VMPlainSocketImpl se.initCause(ioe); throw se; } - + switch (optionId) { case SocketOptions.IP_MULTICAST_LOOP: @@ -242,20 +242,20 @@ public final class VMPlainSocketImpl case SocketOptions.SO_REUSEADDR: case SocketOptions.TCP_NODELAY: return Boolean.valueOf(value != 0); - + case SocketOptions.IP_TOS: case SocketOptions.SO_LINGER: case SocketOptions.SO_RCVBUF: case SocketOptions.SO_SNDBUF: case SocketOptions.SO_TIMEOUT: return new Integer(value); - + default: throw new SocketException("getting option " + optionId + " not supported here"); } } - + private static native int getOption(int fd, int id) throws SocketException; /** @@ -264,7 +264,7 @@ public final class VMPlainSocketImpl * * The optionId is provided to make it possible that the native * implementation may do something different depending on whether - * the value is SocketOptions.IP_MULTICAST_IF or + * the value is SocketOptions.IP_MULTICAST_IF or * SocketOptions.IP_MULTICAST_IF2. */ public InetAddress getMulticastInterface(int optionId) @@ -284,7 +284,7 @@ public final class VMPlainSocketImpl private static native InetAddress getMulticastInterface(int fd, int optionId); - + /** * Binds this socket to the given local address and port. * @@ -306,11 +306,11 @@ public final class VMPlainSocketImpl else throw new SocketException ("unsupported address type"); } - + /** * Native bind function for IPv4 addresses. The addr array must be * exactly four bytes long. - * + * * VMs without native support need not implement this. * * @param fd The native file descriptor integer. @@ -320,11 +320,11 @@ public final class VMPlainSocketImpl */ private static native void bind(int fd, byte[] addr, int port) throws IOException; - + /** * Native bind function for IPv6 addresses. The addr array must be * exactly sixteen bytes long. - * + * * VMs without native support need not implement this. * * @param fd The native file descriptor integer. @@ -346,7 +346,7 @@ public final class VMPlainSocketImpl { listen(nfd.getNativeFD(), backlog); } - + /** * Native listen function. VMs without native support need not implement * this. @@ -366,11 +366,11 @@ public final class VMPlainSocketImpl else throw new IllegalArgumentException("unknown address type"); } - + private static native void join(int fd, byte[] addr) throws IOException; - + private static native void join6(int fd, byte[] addr) throws IOException; - + public void leave(InetAddress group) throws IOException { if (group instanceof Inet4Address) @@ -380,16 +380,16 @@ public final class VMPlainSocketImpl else throw new IllegalArgumentException("unknown address type"); } - + private static native void leave(int fd, byte[] addr) throws IOException; - + private static native void leave6(int fd, byte[] addr) throws IOException; public void joinGroup(InetSocketAddress addr, NetworkInterface netif) throws IOException { InetAddress address = addr.getAddress(); - + if (address instanceof Inet4Address) joinGroup(nfd.getNativeFD(), address.getAddress(), netif != null ? netif.getName() : null); @@ -399,13 +399,13 @@ public final class VMPlainSocketImpl else throw new IllegalArgumentException("unknown address type"); } - + private static native void joinGroup(int fd, byte[] addr, String ifname) throws IOException; - + private static native void joinGroup6(int fd, byte[] addr, String ifname) throws IOException; - + public void leaveGroup(InetSocketAddress addr, NetworkInterface netif) throws IOException { @@ -419,42 +419,42 @@ public final class VMPlainSocketImpl else throw new IllegalArgumentException("unknown address type"); } - + private static native void leaveGroup(int fd, byte[] addr, String ifname) throws IOException; - + private static native void leaveGroup6(int fd, byte[] addr, String ifname) throws IOException; - - + + public void shutdownInput() throws IOException { shutdownInput(nfd.getNativeFD()); } - + private static native void shutdownInput(int native_fd) throws IOException; - + public void shutdownOutput() throws IOException { shutdownOutput(nfd.getNativeFD()); } - + private static native void shutdownOutput(int native_fd) throws IOException; - + public void sendUrgentData(int data) throws IOException { sendUrgentData(nfd.getNativeFD(), data); } - + private static native void sendUrgentData(int natfive_fd, int data) throws IOException; - + public void close() throws IOException { nfd.close(); } - + // Inner classes. - + /** * Our wrapper for the native file descriptor. In this implementation, * it is a simple wrapper around {@link VMChannel.State}, to simplify @@ -463,38 +463,38 @@ public final class VMPlainSocketImpl public final class State { private VMChannel.State channelFd; - + State() { channelFd = null; } - + public boolean isValid() { if (channelFd != null) return channelFd.isValid(); return false; } - + public int getNativeFD() throws IOException { return channelFd.getNativeFD(); } - + public void setChannelFD(final VMChannel.State nfd) throws IOException { if (this.channelFd != null && this.channelFd.isValid()) throw new IOException("file descriptor already initialized"); this.channelFd = nfd; } - + public void close() throws IOException { if (channelFd == null) throw new IOException("invalid file descriptor"); channelFd.close(); } - + protected void finalize() throws Throwable { try @@ -509,4 +509,3 @@ public final class VMPlainSocketImpl } } } - diff --git a/vm/reference/gnu/java/nio/VMChannel.java b/vm/reference/gnu/java/nio/VMChannel.java index a9d1452b7..4494ff13c 100644 --- a/vm/reference/gnu/java/nio/VMChannel.java +++ b/vm/reference/gnu/java/nio/VMChannel.java @@ -53,7 +53,7 @@ import java.nio.MappedByteBuffer; /** * Native interface to support configuring of channel to run in a non-blocking * manner and support scatter/gather io operations. - * + * * @author Michael Barker * */ @@ -61,12 +61,12 @@ public final class VMChannel { /** * Our reference implementation uses an integer to store the native - * file descriptor. Implementations without such support + * file descriptor. Implementations without such support */ private final State nfd; - + private Kind kind; - + public VMChannel() { // XXX consider adding security check here, so only Classpath @@ -74,14 +74,14 @@ public final class VMChannel this.nfd = new State(); kind = Kind.OTHER; } - + /** * This constructor is used by the POSIX reference implementation; * other virtual machines need not support it. - * + * * Important: do not call this in library code that is * not specific to Classpath's reference implementation. - * + * * @param native_fd The native file descriptor integer. * @throws IOException */ @@ -90,7 +90,7 @@ public final class VMChannel this(); this.nfd.setNativeFD(native_fd); } - + public State getState() { return nfd; @@ -105,62 +105,62 @@ public final class VMChannel } initIDs(); } - + public static VMChannel getStdin() throws IOException { return new VMChannel(stdin_fd()); } - + public static VMChannel getStdout() throws IOException { return new VMChannel(stdout_fd()); } - + public static VMChannel getStderr() throws IOException { return new VMChannel(stderr_fd()); } - + private static native int stdin_fd(); private static native int stdout_fd(); private static native int stderr_fd(); - + /** * Set the file descriptor to have the required blocking * setting. - * + * * @param blocking The blocking flag to set. */ public void setBlocking(boolean blocking) throws IOException { setBlocking(nfd.getNativeFD(), blocking); } - + private static native void setBlocking(int fd, boolean blocking) throws IOException; - + public int available() throws IOException { return available(nfd.getNativeFD()); } - + private static native int available(int native_fd) throws IOException; /** * Reads a byte buffer directly using the supplied file descriptor. - * + * * @param dst Direct Byte Buffer to read to. * @return Number of bytes read. - * @throws IOException If an error occurs or dst is not a direct buffers. + * @throws IOException If an error occurs or dst is not a direct buffers. */ public int read(ByteBuffer dst) throws IOException { return read(nfd.getNativeFD(), dst); } - + private static native int read(int fd, ByteBuffer dst) throws IOException; - + /** * Read a single byte. * @@ -171,19 +171,19 @@ public final class VMChannel { return read(nfd.getNativeFD()); } - + private static native int read(int fd) throws IOException; - + /** * Reads into byte buffers directly using the supplied file descriptor. * Assumes that the buffer list contains DirectBuffers. Will perform a * scattering read. - * + * * @param dsts An array direct byte buffers. * @param offset Index of the first buffer to read to. * @param length The number of buffers to read to. * @return Number of bytes read. - * @throws IOException If an error occurs or the dsts are not direct buffers. + * @throws IOException If an error occurs or the dsts are not direct buffers. */ public long readScattering(ByteBuffer[] dsts, int offset, int length) throws IOException @@ -193,11 +193,11 @@ public final class VMChannel return readScattering(nfd.getNativeFD(), dsts, offset, length); } - + private static native long readScattering(int fd, ByteBuffer[] dsts, int offset, int length) throws IOException; - + /** * Receive a datagram on this channel, returning the host address * that sent the datagram. @@ -228,18 +228,18 @@ public final class VMChannel int port = hostPort.getShort() & 0xFFFF; return new InetSocketAddress(Inet6Address.getByAddress(addr), port); } - + throw new SocketException("host address received with invalid length: " + hostlen); } - + private static native int receive (int fd, ByteBuffer dst, ByteBuffer address) throws IOException; /** * Writes from a direct byte bufer using the supplied file descriptor. * Assumes the buffer is a DirectBuffer. - * + * * @param src The source buffer. * @return Number of bytes written. * @throws IOException @@ -248,14 +248,14 @@ public final class VMChannel { return write(nfd.getNativeFD(), src); } - + private native int write(int fd, ByteBuffer src) throws IOException; /** * Writes from byte buffers directly using the supplied file descriptor. * Assumes the that buffer list constains DirectBuffers. Will perform * as gathering write. - * + * * @param srcs * @param offset * @param length @@ -267,13 +267,13 @@ public final class VMChannel { if (offset + length > srcs.length) throw new IndexOutOfBoundsException("offset + length > srcs.length"); - + // A gathering write is limited to 16 buffers; when writing, ensure // that we have at least one buffer with something in it in the 16 // buffer window starting at offset. while (!srcs[offset].hasRemaining() && offset < srcs.length) offset++; - + // There are no buffers with anything to write. if (offset == srcs.length) return 0; @@ -285,11 +285,11 @@ public final class VMChannel return writeGathering(nfd.getNativeFD(), srcs, offset, length); } - + private native long writeGathering(int fd, ByteBuffer[] srcs, int offset, int length) throws IOException; - + /** * Send a datagram to the given address. * @@ -311,15 +311,15 @@ public final class VMChannel else throw new SocketException("unrecognized inet address type"); } - + // Send to an IPv4 address. private static native int send(int fd, ByteBuffer src, byte[] addr, int port) throws IOException; - + // Send to an IPv6 address. private static native int send6(int fd, ByteBuffer src, byte[] addr, int port) throws IOException; - + /** * Write a single byte. * @@ -330,13 +330,13 @@ public final class VMChannel { write(nfd.getNativeFD(), b); } - + private static native void write(int fd, int b) throws IOException; - + private native static void initIDs(); // Network (socket) specific methods. - + /** * Create a new socket. This method will initialize the native file * descriptor state of this instance. @@ -356,7 +356,7 @@ public final class VMChannel kind = Kind.SOCK_DGRAM; nfd.setNativeFD(socket(stream)); } - + /** * Create a new socket, returning the native file descriptor. * @@ -382,7 +382,7 @@ public final class VMChannel int fd; InetAddress addr = saddr.getAddress(); - + // Translates an IOException into a SocketException to conform // to the throws clause. try @@ -402,13 +402,13 @@ public final class VMChannel timeout); throw new SocketException("unsupported internet address"); } - + private static native boolean connect(int fd, byte[] addr, int port, int timeout) throws SocketException; - + private static native boolean connect6(int fd, byte[] addr, int port, int timeout) throws SocketException; - + /** * Disconnect this channel, if it is a datagram socket. Disconnecting * a datagram channel will disassociate it from any address, so the @@ -424,9 +424,9 @@ public final class VMChannel throw new IOException("can only disconnect datagram channels"); disconnect(nfd.getNativeFD()); } - + private static native void disconnect(int fd) throws IOException; - + public InetSocketAddress getLocalAddress() throws IOException { if (!nfd.isValid()) @@ -451,7 +451,7 @@ public final class VMChannel } throw new SocketException("invalid address length"); } - + private static native int getsockname(int fd, ByteBuffer name) throws IOException; @@ -486,7 +486,7 @@ public final class VMChannel } throw new SocketException("invalid address length"); } - + /* * The format here is the peer address, followed by the port number. * The returned value is the length of the peer address; thus, there @@ -494,7 +494,7 @@ public final class VMChannel */ private static native int getpeername(int fd, ByteBuffer name) throws IOException; - + /** * Accept an incoming connection, returning a new VMChannel, or null * if the channel is nonblocking and no connection is pending. @@ -509,17 +509,17 @@ public final class VMChannel return null; return new VMChannel(new_fd); } - + private static native int accept(int native_fd) throws IOException; // File-specific methods. - + /** * Open a file at PATH, initializing the native state to operate on * that open file. - * + * * @param path The absolute file path. - * @throws IOException If the file cannot be opened, or if this + * @throws IOException If the file cannot be opened, or if this * channel was previously initialized. */ public void openFile(String path, int mode) throws IOException @@ -530,25 +530,25 @@ public final class VMChannel nfd.setNativeFD(fd); kind = Kind.FILE; } - + private static native int open(String path, int mode) throws IOException; - + public long position() throws IOException { if (kind != Kind.FILE) throw new IOException("not a file"); return position(nfd.getNativeFD()); } - + private static native long position(int fd) throws IOException; - + public void seek(long pos) throws IOException { if (kind != Kind.FILE) throw new IOException("not a file"); seek(nfd.getNativeFD(), pos); } - + private static native void seek(int fd, long pos) throws IOException; public void truncate(long length) throws IOException @@ -557,9 +557,9 @@ public final class VMChannel throw new IOException("not a file"); truncate(nfd.getNativeFD(), length); } - + private static native void truncate(int fd, long len) throws IOException; - + public boolean lock(long pos, long len, boolean shared, boolean wait) throws IOException { @@ -567,27 +567,27 @@ public final class VMChannel throw new IOException("not a file"); return lock(nfd.getNativeFD(), pos, len, shared, wait); } - + private static native boolean lock(int fd, long pos, long len, boolean shared, boolean wait) throws IOException; - + public void unlock(long pos, long len) throws IOException { if (kind != Kind.FILE) throw new IOException("not a file"); unlock(nfd.getNativeFD(), pos, len); } - + private static native void unlock(int fd, long pos, long len) throws IOException; - + public long size() throws IOException { if (kind != Kind.FILE) throw new IOException("not a file"); return size(nfd.getNativeFD()); } - + private static native long size(int fd) throws IOException; public MappedByteBuffer map(char mode, long position, int size) @@ -597,22 +597,22 @@ public final class VMChannel throw new IOException("not a file"); return map(nfd.getNativeFD(), mode, position, size); } - + private static native MappedByteBuffer map(int fd, char mode, long position, int size) throws IOException; - + public boolean flush(boolean metadata) throws IOException { if (kind != Kind.FILE) throw new IOException("not a file"); return flush(nfd.getNativeFD(), metadata); } - + private static native boolean flush(int fd, boolean metadata) throws IOException; - + // Close. - + /** * Close this socket. The socket is also automatically closed when this * object is finalized. @@ -624,13 +624,13 @@ public final class VMChannel { nfd.close(); } - + static native void close(int native_fd) throws IOException; - + /** *

Provides a simple mean for the JNI code to find out whether the * current thread was interrupted by a call to Thread.interrupt().

- * + * * @return */ static boolean isThreadInterrupted() @@ -639,15 +639,15 @@ public final class VMChannel } // Inner classes. - + /** * A wrapper for a native file descriptor integer. This tracks the state - * of an open file descriptor, and ensures that - * + * of an open file descriptor, and ensures that + * * This class need not be fully supported by virtual machines; if a * virtual machine does not use integer file descriptors, or does and * wishes to hide that, then the methods of this class may be stubbed out. - * + * * System-specific classes that depend on access to native file descriptor * integers SHOULD declare this fact. */ @@ -656,31 +656,31 @@ public final class VMChannel private int native_fd; private boolean valid; private boolean closed; - + State() { native_fd = -1; valid = false; closed = false; } - + public boolean isValid() { return valid; } - + public boolean isClosed() { return closed; } - + public int getNativeFD() throws IOException { if (!valid) throw new IOException("invalid file descriptor"); return native_fd; } - + void setNativeFD(final int native_fd) throws IOException { if (valid) @@ -688,7 +688,7 @@ public final class VMChannel this.native_fd = native_fd; valid = true; } - + public void close() throws IOException { if (!valid) @@ -703,7 +703,7 @@ public final class VMChannel closed = true; } } - + public String toString() { if (closed) @@ -712,7 +712,7 @@ public final class VMChannel return "<>"; return String.valueOf(native_fd); } - + protected void finalize() throws Throwable { try @@ -726,7 +726,7 @@ public final class VMChannel } } } - + /** * An enumeration of possible kinds of channel. */ @@ -734,16 +734,16 @@ public final class VMChannel { /** A streaming (TCP) socket. */ static final Kind SOCK_STREAM = new Kind(); - + /** A datagram (UDP) socket. */ static final Kind SOCK_DGRAM = new Kind(); - + /** A file. */ static final Kind FILE = new Kind(); - + /** Something else; not a socket or file. */ static final Kind OTHER = new Kind(); - + private Kind() { } } } diff --git a/vm/reference/gnu/java/nio/VMPipe.java b/vm/reference/gnu/java/nio/VMPipe.java index e5257c1cf..a36970452 100644 --- a/vm/reference/gnu/java/nio/VMPipe.java +++ b/vm/reference/gnu/java/nio/VMPipe.java @@ -57,7 +57,7 @@ final class VMPipe System.loadLibrary ("javanio"); } } - + /** * Create a pipe, consisting of a readable VMChannel and a writable * VMChannel. The readable channel is returned is the first element @@ -75,6 +75,6 @@ final class VMPipe pipe[1] = new VMChannel(fds[1]); return pipe; } - + private static native int[] pipe0() throws IOException; } diff --git a/vm/reference/gnu/java/nio/VMSelector.java b/vm/reference/gnu/java/nio/VMSelector.java index 488132d24..4d37c2c1c 100644 --- a/vm/reference/gnu/java/nio/VMSelector.java +++ b/vm/reference/gnu/java/nio/VMSelector.java @@ -1,4 +1,4 @@ -/* VMSelector.java -- +/* VMSelector.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ public final class VMSelector System.loadLibrary ("javanio"); } } - + // A timeout value of 0 means block forever. static native int select (int[] read, int[] write, int[] except, long timeout) diff --git a/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java b/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java index 28a021027..86faa097c 100644 --- a/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java +++ b/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java @@ -126,4 +126,4 @@ final class VMSecureRandom running = false; } } -} \ No newline at end of file +} -- cgit v1.2.1