Normalise whitespace.

2010-06-03 Andrew John Hughes <ahughes@redhat.com> * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java, * examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Player.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java, * examples/gnu/classpath/examples/CORBA/swing/x5/State.java, * examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java, * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java, * examples/gnu/classpath/examples/awt/Demo.java, * examples/gnu/classpath/examples/awt/HintingDemo.java, * examples/gnu/classpath/examples/datatransfer/Demo.java, * examples/gnu/classpath/examples/html/Demo.java, * examples/gnu/classpath/examples/java2d/J2dBenchmark.java, * examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java, * examples/gnu/classpath/examples/java2d/JNIOverhead.java, * examples/gnu/classpath/examples/jawt/DemoJAWT.java, * examples/gnu/classpath/examples/management/TestClassLoading.java, * examples/gnu/classpath/examples/management/TestCompilation.java, * examples/gnu/classpath/examples/management/TestGarbageCollector.java, * examples/gnu/classpath/examples/management/TestMemory.java, * examples/gnu/classpath/examples/management/TestMemoryManager.java, * examples/gnu/classpath/examples/management/TestMemoryPool.java, * examples/gnu/classpath/examples/management/TestThread.java, * examples/gnu/classpath/examples/midi/Demo.java, * examples/gnu/classpath/examples/print/Demo.java, * examples/gnu/classpath/examples/sound/AudioPlayerSample.java, * examples/gnu/classpath/examples/swing/BrowserEditorKit.java, * examples/gnu/classpath/examples/swing/ButtonDemo.java, * examples/gnu/classpath/examples/swing/ComboBoxDemo.java, * examples/gnu/classpath/examples/swing/Demo.java, * examples/gnu/classpath/examples/swing/DemoFactory.java, * examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, * examples/gnu/classpath/examples/swing/FileChooserDemo.java, * examples/gnu/classpath/examples/swing/HtmlDemo.java, * examples/gnu/classpath/examples/swing/ListDemo.java, * examples/gnu/classpath/examples/swing/MetalThemeEditor.java, * examples/gnu/classpath/examples/swing/NavigationFilterDemo.java, * examples/gnu/classpath/examples/swing/ScrollBarDemo.java, * examples/gnu/classpath/examples/swing/SliderDemo.java, * examples/gnu/classpath/examples/swing/SpinnerDemo.java, * examples/gnu/classpath/examples/swing/TabbedPaneDemo.java, * examples/gnu/classpath/examples/swing/TableDemo.java, * examples/gnu/classpath/examples/swing/TextAreaDemo.java, * examples/gnu/classpath/examples/swing/TextFieldDemo.java, * examples/gnu/classpath/examples/swing/TreeDemo.java, * gnu/CORBA/BigDecimalHelper.java, * gnu/CORBA/CDR/AbstractCdrInput.java, * gnu/CORBA/CDR/AbstractCdrOutput.java, * gnu/CORBA/CDR/AbstractDataInput.java, * gnu/CORBA/CDR/AbstractDataOutput.java, * gnu/CORBA/CDR/AligningInput.java, * gnu/CORBA/CDR/AligningOutput.java, * gnu/CORBA/CDR/ArrayValueHelper.java, * gnu/CORBA/CDR/BigEndianInputStream.java, * gnu/CORBA/CDR/BigEndianOutputStream.java, * gnu/CORBA/CDR/BufferedCdrOutput.java, * gnu/CORBA/CDR/BufferredCdrInput.java, * gnu/CORBA/CDR/HeadlessInput.java, * gnu/CORBA/CDR/IDLTypeHelper.java, * gnu/CORBA/CDR/LittleEndianOutputStream.java, * gnu/CORBA/CDR/UnknownExceptionCtxHandler.java, * gnu/CORBA/CDR/VMVio.java, * gnu/CORBA/CDR/Vio.java, * gnu/CORBA/CDR/gnuRuntime.java, * gnu/CORBA/CDR/gnuValueStream.java, * gnu/CORBA/CdrEncapsCodecImpl.java, * gnu/CORBA/CollocatedOrbs.java, * gnu/CORBA/Connected_objects.java, * gnu/CORBA/DefaultSocketFactory.java, * gnu/CORBA/DuplicateNameHolder.java, * gnu/CORBA/DynAn/AbstractAny.java, * gnu/CORBA/DynAn/DivideableAny.java, * gnu/CORBA/DynAn/NameValuePairHolder.java, * gnu/CORBA/DynAn/RecordAny.java, * gnu/CORBA/DynAn/ValueChangeListener.java, * gnu/CORBA/DynAn/gnuDynAny.java, * gnu/CORBA/DynAn/gnuDynAnyFactory.java, * gnu/CORBA/DynAn/gnuDynArray.java, * gnu/CORBA/DynAn/gnuDynEnum.java, * gnu/CORBA/DynAn/gnuDynFixed.java, * gnu/CORBA/DynAn/gnuDynSequence.java, * gnu/CORBA/DynAn/gnuDynUnion.java, * gnu/CORBA/DynAn/gnuDynValue.java, * gnu/CORBA/DynAn/gnuDynValueBox.java, * gnu/CORBA/DynAnySeqHolder.java, * gnu/CORBA/EmptyExceptionHolder.java, * gnu/CORBA/ForwardRequestHelper.java, * gnu/CORBA/GIOP/CharSets_OSF.java, * gnu/CORBA/GIOP/CloseMessage.java, * gnu/CORBA/GIOP/ErrorMessage.java, * gnu/CORBA/GIOP/MessageHeader.java, * gnu/CORBA/GIOP/ServiceContext.java, * gnu/CORBA/GIOP/v1_2/RequestHeader.java, * gnu/CORBA/GeneralHolder.java, * gnu/CORBA/IOR.java, * gnu/CORBA/Interceptor/ClientRequestInterceptors.java, * gnu/CORBA/Interceptor/ForwardRequestHolder.java, * gnu/CORBA/Interceptor/IORInterceptors.java, * gnu/CORBA/Interceptor/Registrator.java, * gnu/CORBA/Interceptor/ServerRequestInterceptors.java, * gnu/CORBA/Interceptor/gnuClientRequestInfo.java, * gnu/CORBA/Interceptor/gnuIcCurrent.java, * gnu/CORBA/Interceptor/gnuIorInfo.java, * gnu/CORBA/Interceptor/gnuServerRequestInfo.java, * gnu/CORBA/IorDelegate.java, * gnu/CORBA/IorObject.java, * gnu/CORBA/Minor.java, * gnu/CORBA/NameDynAnyPairHolder.java, * gnu/CORBA/NameDynAnyPairSeqHolder.java, * gnu/CORBA/NameValuePairHolder.java, * gnu/CORBA/NameValuePairSeqHolder.java, * gnu/CORBA/NamingService/NameParser.java, * gnu/CORBA/NamingService/NamingMap.java, * gnu/CORBA/NamingService/NamingServiceTransient.java, * gnu/CORBA/NamingService/TransientContext.java, * gnu/CORBA/ObjectCreator.java, * gnu/CORBA/OrbFocused.java, * gnu/CORBA/OrbFunctional.java, * gnu/CORBA/OrbRestricted.java, * gnu/CORBA/Poa/AOM.java, * gnu/CORBA/Poa/AccessiblePolicy.java, * gnu/CORBA/Poa/DynamicImpHandler.java, * gnu/CORBA/Poa/ForwardRequestHolder.java, * gnu/CORBA/Poa/ForwardedServant.java, * gnu/CORBA/Poa/InvalidPolicyHolder.java, * gnu/CORBA/Poa/LocalDelegate.java, * gnu/CORBA/Poa/LocalRequest.java, * gnu/CORBA/Poa/LocalServerRequest.java, * gnu/CORBA/Poa/ORB_1_4.java, * gnu/CORBA/Poa/ServantDelegateImpl.java, * gnu/CORBA/Poa/StandardPolicies.java, * gnu/CORBA/Poa/gnuAdapterActivator.java, * gnu/CORBA/Poa/gnuForwardRequest.java, * gnu/CORBA/Poa/gnuIdAssignmentPolicy.java, * gnu/CORBA/Poa/gnuIdUniquenessPolicy.java, * gnu/CORBA/Poa/gnuImplicitActivationPolicy.java, * gnu/CORBA/Poa/gnuLifespanPolicy.java, * gnu/CORBA/Poa/gnuPOA.java, * gnu/CORBA/Poa/gnuPOAManager.java, * gnu/CORBA/Poa/gnuPoaCurrent.java, * gnu/CORBA/Poa/gnuRequestProcessingPolicy.java, * gnu/CORBA/Poa/gnuServantObject.java, * gnu/CORBA/Poa/gnuServantRetentionPolicy.java, * gnu/CORBA/Poa/gnuThreadPolicy.java, * gnu/CORBA/ServiceRequestAdapter.java, * gnu/CORBA/SetOverrideTypeHolder.java, * gnu/CORBA/SimpleDelegate.java, * gnu/CORBA/SocketRepository.java, * gnu/CORBA/StreamHolder.java, * gnu/CORBA/TypeCodeHelper.java, * gnu/CORBA/TypeKindNamer.java, * gnu/CORBA/Version.java, * gnu/CORBA/_PolicyImplBase.java, * gnu/CORBA/gnuAny.java, * gnu/CORBA/gnuCodecFactory.java, * gnu/CORBA/gnuEnvironment.java, * gnu/CORBA/gnuRequest.java, * gnu/CORBA/gnuValueHolder.java, * gnu/CORBA/interfaces/SocketFactory.java, * gnu/CORBA/typecodes/AliasTypeCode.java, * gnu/CORBA/typecodes/ArrayTypeCode.java, * gnu/CORBA/typecodes/FixedTypeCode.java, * gnu/CORBA/typecodes/GeneralTypeCode.java, * gnu/CORBA/typecodes/PrimitiveTypeCode.java, * gnu/CORBA/typecodes/RecordTypeCode.java, * gnu/CORBA/typecodes/RecursiveTypeCode.java, * gnu/CORBA/typecodes/StringTypeCode.java, * gnu/classpath/Pair.java, * gnu/classpath/Pointer.java, * gnu/classpath/Pointer32.java, * gnu/classpath/Pointer64.java, * gnu/classpath/ServiceFactory.java, * gnu/classpath/ServiceProviderLoadingAction.java, * gnu/classpath/SystemProperties.java, * gnu/classpath/debug/Component.java, * gnu/classpath/debug/PreciseFilter.java, * gnu/classpath/debug/SystemLogger.java, * gnu/classpath/debug/TeeInputStream.java, * gnu/classpath/debug/TeeReader.java, * gnu/classpath/jdwp/Jdwp.java, * gnu/classpath/jdwp/JdwpConstants.java, * gnu/classpath/jdwp/event/BreakpointEvent.java, * gnu/classpath/jdwp/event/ClassPrepareEvent.java, * gnu/classpath/jdwp/event/ClassUnloadEvent.java, * gnu/classpath/jdwp/event/Event.java, * gnu/classpath/jdwp/event/EventManager.java, * gnu/classpath/jdwp/event/EventRequest.java, * gnu/classpath/jdwp/event/ExceptionEvent.java, * gnu/classpath/jdwp/event/MethodEntryEvent.java, * gnu/classpath/jdwp/event/MethodExitEvent.java, * gnu/classpath/jdwp/event/SingleStepEvent.java, * gnu/classpath/jdwp/event/ThreadEndEvent.java, * gnu/classpath/jdwp/event/VmDeathEvent.java, * gnu/classpath/jdwp/event/VmInitEvent.java, * gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java, * gnu/classpath/jdwp/event/filters/ClassMatchFilter.java, * gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java, * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java, * gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java, * gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java, * gnu/classpath/jdwp/event/filters/StepFilter.java, * gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java, * gnu/classpath/jdwp/exception/InvalidClassException.java, * gnu/classpath/jdwp/exception/InvalidClassLoaderException.java, * gnu/classpath/jdwp/exception/InvalidEventTypeException.java, * gnu/classpath/jdwp/exception/InvalidFieldException.java, * gnu/classpath/jdwp/exception/InvalidFrameException.java, * gnu/classpath/jdwp/exception/InvalidLocationException.java, * gnu/classpath/jdwp/exception/InvalidMethodException.java, * gnu/classpath/jdwp/exception/InvalidObjectException.java, * gnu/classpath/jdwp/exception/InvalidSlotException.java, * gnu/classpath/jdwp/exception/InvalidStringException.java, * gnu/classpath/jdwp/exception/InvalidThreadException.java, * gnu/classpath/jdwp/exception/InvalidThreadGroupException.java, * gnu/classpath/jdwp/exception/NativeMethodException.java, * gnu/classpath/jdwp/exception/NotImplementedException.java, * gnu/classpath/jdwp/id/JdwpId.java, * gnu/classpath/jdwp/id/NullObjectId.java, * gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java, * gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassTypeCommandSet.java, * gnu/classpath/jdwp/processor/CommandSet.java, * gnu/classpath/jdwp/processor/EventRequestCommandSet.java, * gnu/classpath/jdwp/processor/FieldCommandSet.java, * gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java, * gnu/classpath/jdwp/processor/MethodCommandSet.java, * gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/PacketProcessor.java, * gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java, * gnu/classpath/jdwp/processor/StackFrameCommandSet.java, * gnu/classpath/jdwp/processor/StringReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java, * gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java, * gnu/classpath/jdwp/transport/JdwpCommandPacket.java, * gnu/classpath/jdwp/transport/JdwpConnection.java, * gnu/classpath/jdwp/transport/JdwpPacket.java, * gnu/classpath/jdwp/transport/JdwpReplyPacket.java, * gnu/classpath/jdwp/transport/SocketTransport.java, * gnu/classpath/jdwp/transport/TransportFactory.java, * gnu/classpath/jdwp/util/JdwpString.java, * gnu/classpath/jdwp/util/LineTable.java, * gnu/classpath/jdwp/util/Location.java, * gnu/classpath/jdwp/util/MethodResult.java, * gnu/classpath/jdwp/util/MonitorInfo.java, * gnu/classpath/jdwp/util/Signature.java, * gnu/classpath/jdwp/util/VariableTable.java, * gnu/classpath/jdwp/value/ArrayValue.java, * gnu/classpath/jdwp/value/BooleanValue.java, * gnu/classpath/jdwp/value/ByteValue.java, * gnu/classpath/jdwp/value/CharValue.java, * gnu/classpath/jdwp/value/DoubleValue.java, * gnu/classpath/jdwp/value/FloatValue.java, * gnu/classpath/jdwp/value/IntValue.java, * gnu/classpath/jdwp/value/LongValue.java, * gnu/classpath/jdwp/value/ObjectValue.java, * gnu/classpath/jdwp/value/ShortValue.java, * gnu/classpath/jdwp/value/StringValue.java, * gnu/classpath/jdwp/value/Value.java, * gnu/classpath/jdwp/value/ValueFactory.java, * gnu/classpath/jdwp/value/VoidValue.java, * gnu/classpath/toolkit/DefaultDaemonThreadFactory.java, * gnu/java/awt/AWTUtilities.java, * gnu/java/awt/BitMaskExtent.java, * gnu/java/awt/BitwiseXORComposite.java, * gnu/java/awt/Buffers.java, * gnu/java/awt/ClasspathGraphicsEnvironment.java, * gnu/java/awt/ClasspathToolkit.java, * gnu/java/awt/ComponentDataBlitOp.java, * gnu/java/awt/EmbeddedWindow.java, * gnu/java/awt/GradientPaintContext.java, * gnu/java/awt/color/CieXyzConverter.java, * gnu/java/awt/color/ClutProfileConverter.java, * gnu/java/awt/color/ColorLookUpTable.java, * gnu/java/awt/color/GrayProfileConverter.java, * gnu/java/awt/color/GrayScaleConverter.java, * gnu/java/awt/color/LinearRGBConverter.java, * gnu/java/awt/color/ProfileHeader.java, * gnu/java/awt/color/RgbProfileConverter.java, * gnu/java/awt/color/SrgbConverter.java, * gnu/java/awt/color/ToneReproductionCurve.java, * gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java, * gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java, * gnu/java/awt/font/FontDelegate.java, * gnu/java/awt/font/FontFactory.java, * gnu/java/awt/font/GNUGlyphVector.java, * gnu/java/awt/font/OpenTypeFontPeer.java, * gnu/java/awt/font/autofit/GlyphHints.java, * gnu/java/awt/font/autofit/Latin.java, * gnu/java/awt/font/autofit/Utils.java, * gnu/java/awt/font/opentype/CharGlyphMap.java, * gnu/java/awt/font/opentype/GlyphNamer.java, * gnu/java/awt/font/opentype/MacResourceFork.java, * gnu/java/awt/font/opentype/NameDecoder.java, * gnu/java/awt/font/opentype/OpenTypeFont.java, * gnu/java/awt/font/opentype/OpenTypeFontFactory.java, * gnu/java/awt/font/opentype/truetype/GlyphLoader.java, * gnu/java/awt/font/opentype/truetype/GlyphLocator.java, * gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java, * gnu/java/awt/font/opentype/truetype/Point.java, * gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java, * gnu/java/awt/font/opentype/truetype/VirtualMachine.java, * gnu/java/awt/font/opentype/truetype/Zone.java, * gnu/java/awt/font/opentype/truetype/ZonePathIterator.java, * gnu/java/awt/image/AsyncImage.java, * gnu/java/awt/image/ImageConverter.java, * gnu/java/awt/image/ImageDecoder.java, * gnu/java/awt/image/XBMDecoder.java, * gnu/java/awt/java2d/AbstractGraphics2D.java, * gnu/java/awt/java2d/AlphaCompositeContext.java, * gnu/java/awt/java2d/CubicSegment.java, * gnu/java/awt/java2d/LineSegment.java, * gnu/java/awt/java2d/PixelCoverage.java, * gnu/java/awt/java2d/QuadSegment.java, * gnu/java/awt/java2d/RasterGraphics.java, * gnu/java/awt/java2d/ScanlineConverter.java, * gnu/java/awt/java2d/ScanlineCoverage.java, * gnu/java/awt/java2d/Segment.java, * gnu/java/awt/java2d/TexturePaintContext.java, * gnu/java/awt/peer/ClasspathDesktopPeer.java, * gnu/java/awt/peer/ClasspathFontPeer.java, * gnu/java/awt/peer/GLightweightPeer.java, * gnu/java/awt/peer/GnomeDesktopPeer.java, * gnu/java/awt/peer/KDEDesktopPeer.java, * gnu/java/awt/peer/gtk/AsyncImage.java, * gnu/java/awt/peer/gtk/BufferedImageGraphics.java, * gnu/java/awt/peer/gtk/CairoGraphics2D.java, * gnu/java/awt/peer/gtk/CairoSurface.java, * gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java, * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, * gnu/java/awt/peer/gtk/GdkFontPeer.java, * gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java, * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, * gnu/java/awt/peer/gtk/GdkRobotPeer.java, * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, * gnu/java/awt/peer/gtk/GtkButtonPeer.java, * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, * gnu/java/awt/peer/gtk/GtkChoicePeer.java, * gnu/java/awt/peer/gtk/GtkClipboard.java, * gnu/java/awt/peer/gtk/GtkComponentPeer.java, * gnu/java/awt/peer/gtk/GtkContainerPeer.java, * gnu/java/awt/peer/gtk/GtkCursor.java, * gnu/java/awt/peer/gtk/GtkDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFramePeer.java, * gnu/java/awt/peer/gtk/GtkGenericPeer.java, * gnu/java/awt/peer/gtk/GtkImage.java, * gnu/java/awt/peer/gtk/GtkImageConsumer.java, * gnu/java/awt/peer/gtk/GtkLabelPeer.java, * gnu/java/awt/peer/gtk/GtkListPeer.java, * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, * gnu/java/awt/peer/gtk/GtkMenuPeer.java, * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java, * gnu/java/awt/peer/gtk/GtkPanelPeer.java, * gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, * gnu/java/awt/peer/gtk/GtkSelection.java, * gnu/java/awt/peer/gtk/GtkToolkit.java, * gnu/java/awt/peer/gtk/GtkVolatileImage.java, * gnu/java/awt/peer/gtk/GtkWindowPeer.java, * gnu/java/awt/peer/gtk/VolatileImageGraphics.java, * gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java, * gnu/java/awt/peer/qt/MainQtThread.java, * gnu/java/awt/peer/qt/QMatrix.java, * gnu/java/awt/peer/qt/QPainterPath.java, * gnu/java/awt/peer/qt/QPen.java, * gnu/java/awt/peer/qt/QtAudioClip.java, * gnu/java/awt/peer/qt/QtButtonPeer.java, * gnu/java/awt/peer/qt/QtCheckboxPeer.java, * gnu/java/awt/peer/qt/QtChoicePeer.java, * gnu/java/awt/peer/qt/QtComponentGraphics.java, * gnu/java/awt/peer/qt/QtComponentPeer.java, * gnu/java/awt/peer/qt/QtContainerPeer.java, * gnu/java/awt/peer/qt/QtDialogPeer.java, * gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java, * gnu/java/awt/peer/qt/QtFileDialogPeer.java, * gnu/java/awt/peer/qt/QtFontMetrics.java, * gnu/java/awt/peer/qt/QtFontPeer.java, * gnu/java/awt/peer/qt/QtFramePeer.java, * gnu/java/awt/peer/qt/QtGraphics.java, * gnu/java/awt/peer/qt/QtGraphicsEnvironment.java, * gnu/java/awt/peer/qt/QtImage.java, * gnu/java/awt/peer/qt/QtImageConsumer.java, * gnu/java/awt/peer/qt/QtImageDirectGraphics.java, * gnu/java/awt/peer/qt/QtImageGraphics.java, * gnu/java/awt/peer/qt/QtLabelPeer.java, * gnu/java/awt/peer/qt/QtListPeer.java, * gnu/java/awt/peer/qt/QtMenuBarPeer.java, * gnu/java/awt/peer/qt/QtMenuComponentPeer.java, * gnu/java/awt/peer/qt/QtMenuItemPeer.java, * gnu/java/awt/peer/qt/QtMenuPeer.java, * gnu/java/awt/peer/qt/QtPanelPeer.java, * gnu/java/awt/peer/qt/QtPopupMenuPeer.java, * gnu/java/awt/peer/qt/QtRepaintThread.java, * gnu/java/awt/peer/qt/QtScreenDevice.java, * gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java, * gnu/java/awt/peer/qt/QtScrollPanePeer.java, * gnu/java/awt/peer/qt/QtScrollbarPeer.java, * gnu/java/awt/peer/qt/QtTextAreaPeer.java, * gnu/java/awt/peer/qt/QtTextFieldPeer.java, * gnu/java/awt/peer/qt/QtToolkit.java, * gnu/java/awt/peer/qt/QtVolatileImage.java, * gnu/java/awt/peer/qt/QtWindowPeer.java, * gnu/java/awt/peer/swing/SwingButtonPeer.java, * gnu/java/awt/peer/swing/SwingCheckboxPeer.java, * gnu/java/awt/peer/swing/SwingComponent.java, * gnu/java/awt/peer/swing/SwingComponentPeer.java, * gnu/java/awt/peer/swing/SwingContainerPeer.java, * gnu/java/awt/peer/swing/SwingLabelPeer.java, * gnu/java/awt/peer/swing/SwingListPeer.java, * gnu/java/awt/peer/swing/SwingMenuItemPeer.java, * gnu/java/awt/peer/swing/SwingMenuPeer.java, * gnu/java/awt/peer/swing/SwingTextAreaPeer.java, * gnu/java/awt/peer/swing/SwingTextFieldPeer.java, * gnu/java/awt/peer/x/GLGraphics.java, * gnu/java/awt/peer/x/KeyboardMapping.java, * gnu/java/awt/peer/x/XEventPump.java, * gnu/java/awt/peer/x/XFontPeer.java, * gnu/java/awt/peer/x/XFramePeer.java, * gnu/java/awt/peer/x/XGraphics2D.java, * gnu/java/awt/peer/x/XGraphicsConfiguration.java, * gnu/java/awt/peer/x/XGraphicsDevice.java, * gnu/java/awt/peer/x/XGraphicsEnvironment.java, * gnu/java/awt/peer/x/XImage.java, * gnu/java/awt/peer/x/XToolkit.java, * gnu/java/awt/peer/x/XWindowPeer.java, * gnu/java/awt/print/JavaPrinterGraphics.java, * gnu/java/awt/print/JavaPrinterJob.java, * gnu/java/awt/print/PostScriptGraphics2D.java, * gnu/java/awt/print/SpooledDocument.java, * gnu/java/beans/BeanInfoEmbryo.java, * gnu/java/beans/DefaultExceptionListener.java, * gnu/java/beans/ExplicitBeanInfo.java, * gnu/java/beans/IntrospectionIncubator.java, * gnu/java/beans/decoder/AbstractContext.java, * gnu/java/beans/decoder/AbstractCreatableObjectContext.java, * gnu/java/beans/decoder/AbstractElementHandler.java, * gnu/java/beans/decoder/AbstractObjectContext.java, * gnu/java/beans/decoder/ArrayContext.java, * gnu/java/beans/decoder/ArrayHandler.java, * gnu/java/beans/decoder/AssemblyException.java, * gnu/java/beans/decoder/BooleanHandler.java, * gnu/java/beans/decoder/ByteHandler.java, * gnu/java/beans/decoder/CharHandler.java, * gnu/java/beans/decoder/ClassHandler.java, * gnu/java/beans/decoder/ConstructorContext.java, * gnu/java/beans/decoder/Context.java, * gnu/java/beans/decoder/DecoderContext.java, * gnu/java/beans/decoder/DoubleHandler.java, * gnu/java/beans/decoder/DummyContext.java, * gnu/java/beans/decoder/DummyHandler.java, * gnu/java/beans/decoder/ElementHandler.java, * gnu/java/beans/decoder/FloatHandler.java, * gnu/java/beans/decoder/GrowableArrayContext.java, * gnu/java/beans/decoder/IndexContext.java, * gnu/java/beans/decoder/IntHandler.java, * gnu/java/beans/decoder/JavaHandler.java, * gnu/java/beans/decoder/LongHandler.java, * gnu/java/beans/decoder/MethodContext.java, * gnu/java/beans/decoder/MethodFinder.java, * gnu/java/beans/decoder/NullHandler.java, * gnu/java/beans/decoder/ObjectContext.java, * gnu/java/beans/decoder/ObjectHandler.java, * gnu/java/beans/decoder/PersistenceParser.java, * gnu/java/beans/decoder/PropertyContext.java, * gnu/java/beans/decoder/ShortHandler.java, * gnu/java/beans/decoder/SimpleHandler.java, * gnu/java/beans/decoder/StaticMethodContext.java, * gnu/java/beans/decoder/StringHandler.java, * gnu/java/beans/decoder/VoidHandler.java, * gnu/java/beans/editors/ColorEditor.java, * gnu/java/beans/editors/FontEditor.java, * gnu/java/beans/editors/NativeBooleanEditor.java, * gnu/java/beans/editors/NativeByteEditor.java, * gnu/java/beans/editors/NativeDoubleEditor.java, * gnu/java/beans/editors/NativeFloatEditor.java, * gnu/java/beans/editors/NativeIntEditor.java, * gnu/java/beans/editors/NativeLongEditor.java, * gnu/java/beans/editors/NativeShortEditor.java, * gnu/java/beans/editors/StringEditor.java, * gnu/java/beans/encoder/ArrayPersistenceDelegate.java, * gnu/java/beans/encoder/ClassPersistenceDelegate.java, * gnu/java/beans/encoder/CollectionPersistenceDelegate.java, * gnu/java/beans/encoder/Context.java, * gnu/java/beans/encoder/GenericScannerState.java, * gnu/java/beans/encoder/IgnoringScannerState.java, * gnu/java/beans/encoder/MapPersistenceDelegate.java, * gnu/java/beans/encoder/ObjectId.java, * gnu/java/beans/encoder/PrimitivePersistenceDelegate.java, * gnu/java/beans/encoder/ReportingScannerState.java, * gnu/java/beans/encoder/Root.java, * gnu/java/beans/encoder/ScanEngine.java, * gnu/java/beans/encoder/ScannerState.java, * gnu/java/beans/encoder/StAXWriter.java, * gnu/java/beans/encoder/Writer.java, * gnu/java/beans/encoder/elements/ArrayInstantiation.java, * gnu/java/beans/encoder/elements/Array_Get.java, * gnu/java/beans/encoder/elements/ClassResolution.java, * gnu/java/beans/encoder/elements/Element.java, * gnu/java/beans/encoder/elements/List_Get.java, * gnu/java/beans/encoder/elements/List_Set.java, * gnu/java/beans/encoder/elements/MethodInvocation.java, * gnu/java/beans/encoder/elements/NullObject.java, * gnu/java/beans/encoder/elements/ObjectInstantiation.java, * gnu/java/beans/encoder/elements/ObjectReference.java, * gnu/java/beans/encoder/elements/PrimitiveInstantiation.java, * gnu/java/beans/encoder/elements/StaticFieldAccess.java, * gnu/java/beans/encoder/elements/StaticMethodInvocation.java, * gnu/java/beans/encoder/elements/StringReference.java, * gnu/java/io/ASN1ParsingException.java, * gnu/java/io/Base64InputStream.java, * gnu/java/io/ClassLoaderObjectInputStream.java, * gnu/java/io/NullOutputStream.java, * gnu/java/io/ObjectIdentityMap2Int.java, * gnu/java/io/ObjectIdentityWrapper.java, * gnu/java/io/PlatformHelper.java, * gnu/java/lang/CPStringBuilder.java, * gnu/java/lang/CharData.java, * gnu/java/lang/InstrumentationImpl.java, * gnu/java/lang/MainThread.java, * gnu/java/lang/management/BeanImpl.java, * gnu/java/lang/management/ClassLoadingMXBeanImpl.java, * gnu/java/lang/management/CompilationMXBeanImpl.java, * gnu/java/lang/management/GarbageCollectorMXBeanImpl.java, * gnu/java/lang/management/MemoryMXBeanImpl.java, * gnu/java/lang/management/MemoryManagerMXBeanImpl.java, * gnu/java/lang/management/MemoryPoolMXBeanImpl.java, * gnu/java/lang/management/OperatingSystemMXBeanImpl.java, * gnu/java/lang/management/RuntimeMXBeanImpl.java, * gnu/java/lang/management/ThreadMXBeanImpl.java, * gnu/java/lang/reflect/TypeSignature.java, * gnu/java/locale/LocaleHelper.java, * gnu/java/math/Fixed.java, * gnu/java/math/GMP.java, * gnu/java/math/MPN.java, * gnu/java/net/CRLFInputStream.java, * gnu/java/net/CRLFOutputStream.java, * gnu/java/net/DefaultContentHandlerFactory.java, * gnu/java/net/DefaultProxySelector.java, * gnu/java/net/EmptyX509TrustManager.java, * gnu/java/net/GetLocalHostAction.java, * gnu/java/net/HeaderFieldHelper.java, * gnu/java/net/IndexListParser.java, * gnu/java/net/LineInputStream.java, * gnu/java/net/PlainDatagramSocketImpl.java, * gnu/java/net/PlainSocketImpl.java, * gnu/java/net/loader/FileResource.java, * gnu/java/net/loader/FileURLLoader.java, * gnu/java/net/loader/JarURLLoader.java, * gnu/java/net/loader/JarURLResource.java, * gnu/java/net/loader/RemoteResource.java, * gnu/java/net/loader/RemoteURLLoader.java, * gnu/java/net/loader/Resource.java, * gnu/java/net/loader/URLLoader.java, * gnu/java/net/protocol/file/Connection.java, * gnu/java/net/protocol/file/Handler.java, * gnu/java/net/protocol/ftp/ActiveModeDTP.java, * gnu/java/net/protocol/ftp/BlockInputStream.java, * gnu/java/net/protocol/ftp/BlockOutputStream.java, * gnu/java/net/protocol/ftp/CompressedInputStream.java, * gnu/java/net/protocol/ftp/CompressedOutputStream.java, * gnu/java/net/protocol/ftp/DTP.java, * gnu/java/net/protocol/ftp/DTPInputStream.java, * gnu/java/net/protocol/ftp/DTPOutputStream.java, * gnu/java/net/protocol/ftp/FTPConnection.java, * gnu/java/net/protocol/ftp/FTPException.java, * gnu/java/net/protocol/ftp/FTPResponse.java, * gnu/java/net/protocol/ftp/FTPURLConnection.java, * gnu/java/net/protocol/ftp/Handler.java, * gnu/java/net/protocol/ftp/PassiveModeDTP.java, * gnu/java/net/protocol/ftp/StreamInputStream.java, * gnu/java/net/protocol/ftp/StreamOutputStream.java, * gnu/java/net/protocol/http/Authenticator.java, * gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java, * gnu/java/net/protocol/http/ChunkedInputStream.java, * gnu/java/net/protocol/http/Cookie.java, * gnu/java/net/protocol/http/CookieManager.java, * gnu/java/net/protocol/http/Credentials.java, * gnu/java/net/protocol/http/HTTPConnection.java, * gnu/java/net/protocol/http/HTTPDateFormat.java, * gnu/java/net/protocol/http/HTTPURLConnection.java, * gnu/java/net/protocol/http/Handler.java, * gnu/java/net/protocol/http/Headers.java, * gnu/java/net/protocol/http/Request.java, * gnu/java/net/protocol/http/RequestBodyWriter.java, * gnu/java/net/protocol/http/Response.java, * gnu/java/net/protocol/http/ResponseHeaderHandler.java, * gnu/java/net/protocol/http/SimpleCookieManager.java, * gnu/java/net/protocol/https/Handler.java, * gnu/java/net/protocol/jar/Connection.java, * gnu/java/net/protocol/jar/Handler.java, * gnu/java/nio/ChannelInputStream.java, * gnu/java/nio/ChannelOutputStream.java, * gnu/java/nio/ChannelReader.java, * gnu/java/nio/ChannelWriter.java, * gnu/java/nio/DatagramChannelImpl.java, * gnu/java/nio/DatagramChannelSelectionKey.java, * gnu/java/nio/EpollSelectionKeyImpl.java, * gnu/java/nio/EpollSelectorImpl.java, * gnu/java/nio/FileChannelImpl.java, * gnu/java/nio/FileLockImpl.java, * gnu/java/nio/InputStreamChannel.java, * gnu/java/nio/KqueueSelectionKeyImpl.java, * gnu/java/nio/KqueueSelectorImpl.java, * gnu/java/nio/NIODatagramSocket.java, * gnu/java/nio/NIOServerSocket.java, * gnu/java/nio/NIOSocket.java, * gnu/java/nio/NIOSocketImpl.java, * gnu/java/nio/OutputStreamChannel.java, * gnu/java/nio/PipeImpl.java, * gnu/java/nio/SelectionKeyImpl.java, * gnu/java/nio/SelectorImpl.java, * gnu/java/nio/SelectorProviderImpl.java, * gnu/java/nio/ServerSocketChannelImpl.java, * gnu/java/nio/ServerSocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelImpl.java, * gnu/java/nio/SocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelSelectionKeyImpl.java, * gnu/java/nio/VMChannelOwner.java, * gnu/java/nio/charset/ByteCharset.java, * gnu/java/nio/charset/ByteDecodeLoopHelper.java, * gnu/java/nio/charset/ByteEncodeLoopHelper.java, * gnu/java/nio/charset/Cp424.java, * gnu/java/nio/charset/Cp437.java, * gnu/java/nio/charset/Cp737.java, * gnu/java/nio/charset/Cp775.java, * gnu/java/nio/charset/Cp850.java, * gnu/java/nio/charset/Cp852.java, * gnu/java/nio/charset/Cp855.java, * gnu/java/nio/charset/Cp857.java, * gnu/java/nio/charset/Cp860.java, * gnu/java/nio/charset/Cp861.java, * gnu/java/nio/charset/Cp862.java, * gnu/java/nio/charset/Cp863.java, * gnu/java/nio/charset/Cp864.java, * gnu/java/nio/charset/Cp865.java, * gnu/java/nio/charset/Cp866.java, * gnu/java/nio/charset/Cp869.java, * gnu/java/nio/charset/Cp874.java, * gnu/java/nio/charset/EncodingHelper.java, * gnu/java/nio/charset/ISO_8859_1.java, * gnu/java/nio/charset/ISO_8859_13.java, * gnu/java/nio/charset/ISO_8859_15.java, * gnu/java/nio/charset/ISO_8859_2.java, * gnu/java/nio/charset/ISO_8859_3.java, * gnu/java/nio/charset/ISO_8859_4.java, * gnu/java/nio/charset/ISO_8859_5.java, * gnu/java/nio/charset/ISO_8859_6.java, * gnu/java/nio/charset/ISO_8859_7.java, * gnu/java/nio/charset/ISO_8859_8.java, * gnu/java/nio/charset/ISO_8859_9.java, * gnu/java/nio/charset/KOI_8.java, * gnu/java/nio/charset/MS874.java, * gnu/java/nio/charset/MacCentralEurope.java, * gnu/java/nio/charset/MacCroatian.java, * gnu/java/nio/charset/MacCyrillic.java, * gnu/java/nio/charset/MacDingbat.java, * gnu/java/nio/charset/MacGreek.java, * gnu/java/nio/charset/MacIceland.java, * gnu/java/nio/charset/MacRoman.java, * gnu/java/nio/charset/MacRomania.java, * gnu/java/nio/charset/MacSymbol.java, * gnu/java/nio/charset/MacThai.java, * gnu/java/nio/charset/MacTurkish.java, * gnu/java/
author: Andrew John Hughes <gnu_andrew@member.fsf.org> 2010-06-03 19:11:10 +0000
committer: Andrew John Hughes <gnu_andrew@member.fsf.org> 2010-06-03 19:11:10 +0000
commit: a17284098845d59d84bbf76b33190a5a91c12a82 (patch)
tree: c634c40062604cd1cdefa535b838926c9ede1a38 /gnu/java/beans/decoder/PersistenceParser.java
parent: 43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download: classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz
1 files changed, 419 insertions, 419 deletions
diff --git a/gnu/java/beans/decoder/PersistenceParser.java b/gnu/java/beans/decoder/PersistenceParser.java
index 4eb37abef..c4c8866c3 100644
--- a/gnu/java/beans/decoder/PersistenceParser.java
+++ b/gnu/java/beans/decoder/PersistenceParser.java
@@ -62,424 +62,424 @@ import org.xml.sax.helpers.DefaultHandler;
  */
 public class PersistenceParser extends DefaultHandler implements Context
 {
-	/** The ExceptionListener instance which is informed of non-critical parsing exceptions.
-	 */
-	private ExceptionListener exceptionListener;
-
-	/** When an element was not usable all elements inside it should be skipped.
-	 * This is done by skipping startElement() and endElement() invocations whenever
-	 * this value is above 0.
-	 */
-	private int skipElement;
-
-	/** Stores the Creator instances which can instantiate the appropriate handler implementation
-	 * for a given element.
-	 */
-	private HashMap handlerCreators = new HashMap();
-
-	/** Denotes the current ElementHandler. To avoid checking for null-values it is pre-assigned
-	 * with a DummyHandler instance which must not be used but acts as a root element.
-	 */
-	private ElementHandler currentHandler;
-
-	/** The real root element that stores all objects created during parsing.
-	 * Package-private to avoid an accessor method.
-	 */
-	JavaHandler javaHandler;
-
-	/** Stores the decoded objects. */
-	private List objects = new LinkedList();
-
-	/** The XMLDecoder instance that started this PersistenceParser */
-	private XMLDecoder decoder;
-
-	/** Creates a PersistenceParser which reads XML data from the given InputStream, reports
-	 * exceptions to ExceptionListener instance, stores resulting object in the DecoderContext
-	 * and uses the given ClassLoader to resolve classes.
-	 *
-	 * @param inputStream
-	 * @param exceptionListener
-	 * @param decoderContext
-	 * @param cl
-	 */
-	public PersistenceParser(
-		InputStream inputStream,
-		ExceptionListener exceptionListener,
-		ClassLoader cl,
-		XMLDecoder decoder)
-	{
-
-		this.exceptionListener = exceptionListener;
-		this.decoder = decoder;
-
-		DummyHandler dummyHandler = new DummyHandler();
-		currentHandler = dummyHandler;
-		javaHandler = new JavaHandler(dummyHandler, this, cl);
-
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-
-		SAXParser parser;
-		try
-		{
-			parser = factory.newSAXParser();
-		}
-		catch (ParserConfigurationException pce)
-		{
-			// should not happen when a parser is available because we did
-			// not request any requirements on the XML parser
-			throw (InternalError) new InternalError(
-				"No SAX Parser available.").initCause(
-				pce);
-		}
-		catch (SAXException saxe)
-		{
-			// should not happen when a parser is available because we did
-			// not request any requirements on the XML parser
-			throw (InternalError) new InternalError(
-				"No SAX Parser available.").initCause(
-				saxe);
-		}
-
-		// prepares a map of Creator instances which can instantiate a handler which is
-		// appropriate for the tag that is used as a key for the Creator
-		handlerCreators.put("java", new JavaHandlerCreator());
-
-		// calls methods (properties), constructors, access fields
-		handlerCreators.put("object", new ObjectHandlerCreator());
-		handlerCreators.put("void", new VoidHandlerCreator());
-
-		handlerCreators.put("array", new ArrayHandlerCreator());
-
-		// these handler directly create an Object (or null)
-		handlerCreators.put("class", new ClassHandlerCreator());
-		handlerCreators.put("null", new NullHandlerCreator());
-
-		handlerCreators.put("char", new CharHandlerCreator());
-		handlerCreators.put("string", new StringHandlerCreator());
-		handlerCreators.put("boolean", new BooleanHandlerCreator());
-		handlerCreators.put("byte", new ByteHandlerCreator());
-		handlerCreators.put("short", new ShortHandlerCreator());
-		handlerCreators.put("int", new IntHandlerCreator());
-		handlerCreators.put("long", new LongHandlerCreator());
-		handlerCreators.put("float", new FloatHandlerCreator());
-		handlerCreators.put("double", new DoubleHandlerCreator());
-
-		// parses the data and sends all exceptions to the ExceptionListener
-		try
-		{
-			parser.parse(inputStream, this);
-		}
-		catch (SAXException saxe)
-		{
-			exceptionListener.exceptionThrown(
-				new IllegalArgumentException("XML data not well-formed."));
-		}
-		catch (IOException ioe)
-		{
-			exceptionListener.exceptionThrown(ioe);
-		}
-	}
-
-	public void startElement(
-		String uri,
-		String localName,
-		String qName,
-		Attributes attributes)
-		throws SAXException
-	{
-		/* The element is skipped if
-		 * a) the current handler has already failed or a previous error occured
-		 * which makes all children obsolete
-		 */
-		if (currentHandler.hasFailed() || skipElement > 0)
-		{
-			exceptionListener.exceptionThrown(
-				new IllegalArgumentException(
-					"Element unusable due to previous error: " + qName));
-
-			skipElement++;
-
-			return;
-		}
-
-		/* b) Subelements are not allowed within the current ElementHandler.
-		 */
-		if (!currentHandler.isSubelementAllowed(qName))
-		{
-			exceptionListener.exceptionThrown(
-				new IllegalArgumentException(
-					"Element is not allowed here: " + qName));
-
-			skipElement++;
-
-			return;
-		}
-
-		/* c) The tag name is not a key in the map of Creator instances. This means that
-		* either the XML data is of a newer version or simply contains a miss-spelled element.
-		*/
-		if (!handlerCreators.containsKey(qName))
-		{
-			exceptionListener.exceptionThrown(
-				new IllegalArgumentException(
-					"Element unusable because tag is unknown: " + qName));
-
-			skipElement++;
-
-			return;
-		}
-
-		// creates a new handler for the new element
-		AbstractElementHandler handler =
-			((Creator) handlerCreators.get(qName)).createHandler(
-				currentHandler);
-
-		// makes it the current handler to receive character data
-		currentHandler = handler;
-
-		// starts the handler
-		currentHandler.start(attributes, exceptionListener);
-	}
-
-	public void endElement(String uri, String localName, String qName)
-		throws SAXException
-	{
-		// skips processing the current handler if we are parsing an element
-		// which was marked invalid (in startElement() ) 
-		if (skipElement > 0)
-		{
-			skipElement--;
-			return;
-		}
-
-		// invokes the handler's finishing method
-		currentHandler.end(exceptionListener);
-
-		// removes the current handler and reactivates its parent
-		currentHandler = currentHandler.getParent();
-	}
-
-	/** Transfers character data to the current handler
-	 */
-	public void characters(char[] ch, int start, int length)
-		throws SAXException
-	{
-		// prevents sending character data of invalid elements
-		if (skipElement > 0)
-			return;
-
-		currentHandler.characters(ch, start, length);
-	}
-
-	/** Creator interface provided a mechanism to instantiate ElementHandler instances
-	 * for the appropriate tag.
-	 *
-	 * @author Robert Schuster
-	 */
-	interface Creator
-	{
-		/** Creates an ElementHandler instance using the given ElementHandler as its parent.
-		 *
-		 * @param parent The parent ElementHandler of the result.
-		 * @return A new ElementHandler instance.
-		 */
-		AbstractElementHandler createHandler(ElementHandler parent);
-	}
-
-	class BooleanHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new BooleanHandler(parent);
-		}
-	}
-
-	class ByteHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new ByteHandler(parent);
-		}
-	}
-
-	class ShortHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new ShortHandler(parent);
-		}
-	}
-
-	class IntHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new IntHandler(parent);
-		}
-	}
-
-	class LongHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new LongHandler(parent);
-		}
-	}
-
-	class FloatHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new FloatHandler(parent);
-		}
-	}
-
-	class DoubleHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new DoubleHandler(parent);
-		}
-	}
-
-	class CharHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new CharHandler(parent);
-		}
-	}
-
-	class StringHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new StringHandler(parent);
-		}
-	}
-
-	class JavaHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return javaHandler;
-		}
-	}
-
-	class ObjectHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new ObjectHandler(parent);
-		}
-	}
-
-	class VoidHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new VoidHandler(parent);
-		}
-	}
-
-	class ClassHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new ClassHandler(parent);
-		}
-	}
-
-	class NullHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new NullHandler(parent);
-		}
-	}
-
-	class ArrayHandlerCreator implements Creator
-	{
-		public AbstractElementHandler createHandler(ElementHandler parent)
-		{
-			return new ArrayHandler(parent);
-		}
-	}
-
-	/** Adds a decoded object to the Context. */
-	public void addParameterObject(Object o) throws AssemblyException
-	{
-		objects.add(o);
-	}
-
-	public void notifyStatement(Context outerContext) throws AssemblyException
-	{
-		// can be ignored because theis Context does not react to statement and expressions
-		// differently
-	}
-
-	public Object endContext(Context outerContext) throws AssemblyException
-	{
-		return null;
-	}
-
-	public boolean subContextFailed()
-	{
-		// failing of subcontexts is no problem for the mother of all contexts
-		return false;
-	}
-
-	public void set(int index, Object o) throws AssemblyException
-	{
-		// not supported
-		throw new AssemblyException(
-			new IllegalArgumentException("Set method is not allowed in decoder context."));
-	}
-
-	public Object get(int index) throws AssemblyException
-	{
-		// not supported
-		throw new AssemblyException(
-			new IllegalArgumentException("Get method is not allowed in decoder context."));
-	}
-
-	public Object getResult()
-	{
-		// returns the XMLDecoder instance which is requested by child contexts this way.
-		// That is needed to invoke methods on the decoder.
-		return decoder;
-	}
-
-	public void setId(String id)
-	{
-		exceptionListener.exceptionThrown(new IllegalArgumentException("id attribute is not allowed for <java> tag."));
-	}
-
-	public String getId()
-	{
-		// appears to have no id
-		return null;
-	}
-
-	public boolean isStatement()
-	{
-		// this context is a statement by definition because it never returns anything to a parent because
-		// there is no such parent (DummyContext does not count!)
-		return true;
-	}
-
-	public void setStatement(boolean b)
-	{
-		// ignores that because this Context is always a statement
-	}
-
-	/** Returns an Iterator instance which returns the decoded objects.
-	 * 
-	 * This method is used by the XMLDecoder directly. 
-	 */ 
-	public Iterator iterator()
-	{
-		return objects.iterator();
-	}
+        /** The ExceptionListener instance which is informed of non-critical parsing exceptions.
+         */
+        private ExceptionListener exceptionListener;
+
+        /** When an element was not usable all elements inside it should be skipped.
+         * This is done by skipping startElement() and endElement() invocations whenever
+         * this value is above 0.
+         */
+        private int skipElement;
+
+        /** Stores the Creator instances which can instantiate the appropriate handler implementation
+         * for a given element.
+         */
+        private HashMap handlerCreators = new HashMap();
+
+        /** Denotes the current ElementHandler. To avoid checking for null-values it is pre-assigned
+         * with a DummyHandler instance which must not be used but acts as a root element.
+         */
+        private ElementHandler currentHandler;
+
+        /** The real root element that stores all objects created during parsing.
+         * Package-private to avoid an accessor method.
+         */
+        JavaHandler javaHandler;
+
+        /** Stores the decoded objects. */
+        private List objects = new LinkedList();
+
+        /** The XMLDecoder instance that started this PersistenceParser */
+        private XMLDecoder decoder;
+
+        /** Creates a PersistenceParser which reads XML data from the given InputStream, reports
+         * exceptions to ExceptionListener instance, stores resulting object in the DecoderContext
+         * and uses the given ClassLoader to resolve classes.
+         *
+         * @param inputStream
+         * @param exceptionListener
+         * @param decoderContext
+         * @param cl
+         */
+        public PersistenceParser(
+                InputStream inputStream,
+                ExceptionListener exceptionListener,
+                ClassLoader cl,
+                XMLDecoder decoder)
+        {
+
+                this.exceptionListener = exceptionListener;
+                this.decoder = decoder;
+
+                DummyHandler dummyHandler = new DummyHandler();
+                currentHandler = dummyHandler;
+                javaHandler = new JavaHandler(dummyHandler, this, cl);
+
+                SAXParserFactory factory = SAXParserFactory.newInstance();
+
+                SAXParser parser;
+                try
+                {
+                        parser = factory.newSAXParser();
+                }
+                catch (ParserConfigurationException pce)
+                {
+                        // should not happen when a parser is available because we did
+                        // not request any requirements on the XML parser
+                        throw (InternalError) new InternalError(
+                                "No SAX Parser available.").initCause(
+                                pce);
+                }
+                catch (SAXException saxe)
+                {
+                        // should not happen when a parser is available because we did
+                        // not request any requirements on the XML parser
+                        throw (InternalError) new InternalError(
+                                "No SAX Parser available.").initCause(
+                                saxe);
+                }
+
+                // prepares a map of Creator instances which can instantiate a handler which is
+                // appropriate for the tag that is used as a key for the Creator
+                handlerCreators.put("java", new JavaHandlerCreator());
+
+                // calls methods (properties), constructors, access fields
+                handlerCreators.put("object", new ObjectHandlerCreator());
+                handlerCreators.put("void", new VoidHandlerCreator());
+
+                handlerCreators.put("array", new ArrayHandlerCreator());
+
+                // these handler directly create an Object (or null)
+                handlerCreators.put("class", new ClassHandlerCreator());
+                handlerCreators.put("null", new NullHandlerCreator());
+
+                handlerCreators.put("char", new CharHandlerCreator());
+                handlerCreators.put("string", new StringHandlerCreator());
+                handlerCreators.put("boolean", new BooleanHandlerCreator());
+                handlerCreators.put("byte", new ByteHandlerCreator());
+                handlerCreators.put("short", new ShortHandlerCreator());
+                handlerCreators.put("int", new IntHandlerCreator());
+                handlerCreators.put("long", new LongHandlerCreator());
+                handlerCreators.put("float", new FloatHandlerCreator());
+                handlerCreators.put("double", new DoubleHandlerCreator());
+
+                // parses the data and sends all exceptions to the ExceptionListener
+                try
+                {
+                        parser.parse(inputStream, this);
+                }
+                catch (SAXException saxe)
+                {
+                        exceptionListener.exceptionThrown(
+                                new IllegalArgumentException("XML data not well-formed."));
+                }
+                catch (IOException ioe)
+                {
+                        exceptionListener.exceptionThrown(ioe);
+                }
+        }
+
+        public void startElement(
+                String uri,
+                String localName,
+                String qName,
+                Attributes attributes)
+                throws SAXException
+        {
+                /* The element is skipped if
+                 * a) the current handler has already failed or a previous error occured
+                 * which makes all children obsolete
+                 */
+                if (currentHandler.hasFailed() || skipElement > 0)
+                {
+                        exceptionListener.exceptionThrown(
+                                new IllegalArgumentException(
+                                        "Element unusable due to previous error: " + qName));
+
+                        skipElement++;
+
+                        return;
+                }
+
+                /* b) Subelements are not allowed within the current ElementHandler.
+                 */
+                if (!currentHandler.isSubelementAllowed(qName))
+                {
+                        exceptionListener.exceptionThrown(
+                                new IllegalArgumentException(
+                                        "Element is not allowed here: " + qName));
+
+                        skipElement++;
+
+                        return;
+                }
+
+                /* c) The tag name is not a key in the map of Creator instances. This means that
+                * either the XML data is of a newer version or simply contains a miss-spelled element.
+                */
+                if (!handlerCreators.containsKey(qName))
+                {
+                        exceptionListener.exceptionThrown(
+                                new IllegalArgumentException(
+                                        "Element unusable because tag is unknown: " + qName));
+
+                        skipElement++;
+
+                        return;
+                }
+
+                // creates a new handler for the new element
+                AbstractElementHandler handler =
+                        ((Creator) handlerCreators.get(qName)).createHandler(
+                                currentHandler);
+
+                // makes it the current handler to receive character data
+                currentHandler = handler;
+
+                // starts the handler
+                currentHandler.start(attributes, exceptionListener);
+        }
+
+        public void endElement(String uri, String localName, String qName)
+                throws SAXException
+        {
+                // skips processing the current handler if we are parsing an element
+                // which was marked invalid (in startElement() )
+                if (skipElement > 0)
+                {
+                        skipElement--;
+                        return;
+                }
+
+                // invokes the handler's finishing method
+                currentHandler.end(exceptionListener);
+
+                // removes the current handler and reactivates its parent
+                currentHandler = currentHandler.getParent();
+        }
+
+        /** Transfers character data to the current handler
+         */
+        public void characters(char[] ch, int start, int length)
+                throws SAXException
+        {
+                // prevents sending character data of invalid elements
+                if (skipElement > 0)
+                        return;
+
+                currentHandler.characters(ch, start, length);
+        }
+
+        /** Creator interface provided a mechanism to instantiate ElementHandler instances
+         * for the appropriate tag.
+         *
+         * @author Robert Schuster
+         */
+        interface Creator
+        {
+                /** Creates an ElementHandler instance using the given ElementHandler as its parent.
+                 *
+                 * @param parent The parent ElementHandler of the result.
+                 * @return A new ElementHandler instance.
+                 */
+                AbstractElementHandler createHandler(ElementHandler parent);
+        }
+
+        class BooleanHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new BooleanHandler(parent);
+                }
+        }
+
+        class ByteHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new ByteHandler(parent);
+                }
+        }
+
+        class ShortHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new ShortHandler(parent);
+                }
+        }
+
+        class IntHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new IntHandler(parent);
+                }
+        }
+
+        class LongHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new LongHandler(parent);
+                }
+        }
+
+        class FloatHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new FloatHandler(parent);
+                }
+        }
+
+        class DoubleHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new DoubleHandler(parent);
+                }
+        }
+
+        class CharHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new CharHandler(parent);
+                }
+        }
+
+        class StringHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new StringHandler(parent);
+                }
+        }
+
+        class JavaHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return javaHandler;
+                }
+        }
+
+        class ObjectHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new ObjectHandler(parent);
+                }
+        }
+
+        class VoidHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new VoidHandler(parent);
+                }
+        }
+
+        class ClassHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new ClassHandler(parent);
+                }
+        }
+
+        class NullHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new NullHandler(parent);
+                }
+        }
+
+        class ArrayHandlerCreator implements Creator
+        {
+                public AbstractElementHandler createHandler(ElementHandler parent)
+                {
+                        return new ArrayHandler(parent);
+                }
+        }
+
+        /** Adds a decoded object to the Context. */
+        public void addParameterObject(Object o) throws AssemblyException
+        {
+                objects.add(o);
+        }
+
+        public void notifyStatement(Context outerContext) throws AssemblyException
+        {
+                // can be ignored because theis Context does not react to statement and expressions
+                // differently
+        }
+
+        public Object endContext(Context outerContext) throws AssemblyException
+        {
+                return null;
+        }
+
+        public boolean subContextFailed()
+        {
+                // failing of subcontexts is no problem for the mother of all contexts
+                return false;
+        }
+
+        public void set(int index, Object o) throws AssemblyException
+        {
+                // not supported
+                throw new AssemblyException(
+                        new IllegalArgumentException("Set method is not allowed in decoder context."));
+        }
+
+        public Object get(int index) throws AssemblyException
+        {
+                // not supported
+                throw new AssemblyException(
+                        new IllegalArgumentException("Get method is not allowed in decoder context."));
+        }
+
+        public Object getResult()
+        {
+                // returns the XMLDecoder instance which is requested by child contexts this way.
+                // That is needed to invoke methods on the decoder.
+                return decoder;
+        }
+
+        public void setId(String id)
+        {
+                exceptionListener.exceptionThrown(new IllegalArgumentException("id attribute is not allowed for <java> tag."));
+        }
+
+        public String getId()
+        {
+                // appears to have no id
+                return null;
+        }
+
+        public boolean isStatement()
+        {
+                // this context is a statement by definition because it never returns anything to a parent because
+                // there is no such parent (DummyContext does not count!)
+                return true;
+        }
+
+        public void setStatement(boolean b)
+        {
+                // ignores that because this Context is always a statement
+        }
+
+        /** Returns an Iterator instance which returns the decoded objects.
+         *
+         * This method is used by the XMLDecoder directly.
+         */
+        public Iterator iterator()
+        {
+                return objects.iterator();
+        }
 
 }
author	Andrew John Hughes <gnu_andrew@member.fsf.org>	2010-06-03 19:11:10 +0000
committer	Andrew John Hughes <gnu_andrew@member.fsf.org>	2010-06-03 19:11:10 +0000
commit	a17284098845d59d84bbf76b33190a5a91c12a82 (patch)
tree	c634c40062604cd1cdefa535b838926c9ede1a38 /gnu/java/beans/decoder/PersistenceParser.java
parent	43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff)
download	classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz