diff options
| 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/awt/peer/qt | |
| parent | 43b6a8d2580b5c9549a58db41a0239f3929e4b91 (diff) | |
| download | classpath-a17284098845d59d84bbf76b33190a5a91c12a82.tar.gz | |
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/
Diffstat (limited to 'gnu/java/awt/peer/qt')
41 files changed, 845 insertions, 890 deletions
diff --git a/gnu/java/awt/peer/qt/MainQtThread.java b/gnu/java/awt/peer/qt/MainQtThread.java index fdd6da0a6..bee979ac7 100644 --- a/gnu/java/awt/peer/qt/MainQtThread.java +++ b/gnu/java/awt/peer/qt/MainQtThread.java @@ -81,6 +81,4 @@ public class MainQtThread extends Thread exec(QApplicationPointer); } -} - - +} diff --git a/gnu/java/awt/peer/qt/QMatrix.java b/gnu/java/awt/peer/qt/QMatrix.java index 428cda173..ca4d55b59 100644 --- a/gnu/java/awt/peer/qt/QMatrix.java +++ b/gnu/java/awt/peer/qt/QMatrix.java @@ -53,8 +53,8 @@ public class QMatrix extends NativeWrapper init( matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5] ); } - private native void init(double m00, double m10, double m01, double m11, - double m02, double m12 ); + private native void init(double m00, double m10, double m01, double m11, + double m02, double m12 ); private native double[] getMatrix(); @@ -64,10 +64,9 @@ public class QMatrix extends NativeWrapper } public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/gnu/java/awt/peer/qt/QPainterPath.java b/gnu/java/awt/peer/qt/QPainterPath.java index 8d176a156..848b10497 100644 --- a/gnu/java/awt/peer/qt/QPainterPath.java +++ b/gnu/java/awt/peer/qt/QPainterPath.java @@ -61,31 +61,31 @@ public class QPainterPath extends NativeWrapper while( !pi.isDone() ) { - switch( pi.currentSegment(coords) ) - { - case PathIterator.SEG_MOVETO: - moveTo( coords[0], coords[1] ); - break; - - case PathIterator.SEG_CLOSE: - close(); - break; - - case PathIterator.SEG_LINETO: - lineTo( coords[0], coords[1] ); - break; - - case PathIterator.SEG_QUADTO: - quadTo( coords[0], coords[1], coords[2], coords[3] ); - break; - - case PathIterator.SEG_CUBICTO: - cubicTo( coords[0], coords[1], - coords[2], coords[3], - coords[4], coords[5] ); - break; - } - pi.next(); + switch( pi.currentSegment(coords) ) + { + case PathIterator.SEG_MOVETO: + moveTo( coords[0], coords[1] ); + break; + + case PathIterator.SEG_CLOSE: + close(); + break; + + case PathIterator.SEG_LINETO: + lineTo( coords[0], coords[1] ); + break; + + case PathIterator.SEG_QUADTO: + quadTo( coords[0], coords[1], coords[2], coords[3] ); + break; + + case PathIterator.SEG_CUBICTO: + cubicTo( coords[0], coords[1], + coords[2], coords[3], + coords[4], coords[5] ); + break; + } + pi.next(); } } @@ -129,13 +129,12 @@ public class QPainterPath extends NativeWrapper private native void quadTo(double x1, double y1, double x2, double y2); private native void cubicTo(double x1, double y1, double x2, double y2, - double x3, double y3); + double x3, double y3); public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/gnu/java/awt/peer/qt/QPen.java b/gnu/java/awt/peer/qt/QPen.java index ec41015ed..aee308c26 100644 --- a/gnu/java/awt/peer/qt/QPen.java +++ b/gnu/java/awt/peer/qt/QPen.java @@ -62,10 +62,9 @@ public class QPen extends NativeWrapper private native void init(double width, int cap, int join, double miterlimit); public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/gnu/java/awt/peer/qt/QtAudioClip.java b/gnu/java/awt/peer/qt/QtAudioClip.java index 43387acf6..ae2e350eb 100644 --- a/gnu/java/awt/peer/qt/QtAudioClip.java +++ b/gnu/java/awt/peer/qt/QtAudioClip.java @@ -57,9 +57,9 @@ public class QtAudioClip extends NativeWrapper implements AudioClip File f = new File(filename); try { - String fn = f.getCanonicalPath(); - loadClip( fn ); - } + String fn = f.getCanonicalPath(); + loadClip( fn ); + } catch(IOException e) { } @@ -67,7 +67,7 @@ public class QtAudioClip extends NativeWrapper implements AudioClip public QtAudioClip(URL url) { - + } private native void loadClip(String filename); @@ -78,7 +78,7 @@ public class QtAudioClip extends NativeWrapper implements AudioClip /** * Checks that Qt and sound is available. - */ + */ private void checkForQt() { if( t == null ) diff --git a/gnu/java/awt/peer/qt/QtButtonPeer.java b/gnu/java/awt/peer/qt/QtButtonPeer.java index 629f45911..6722eb285 100644 --- a/gnu/java/awt/peer/qt/QtButtonPeer.java +++ b/gnu/java/awt/peer/qt/QtButtonPeer.java @@ -62,18 +62,14 @@ public class QtButtonPeer extends QtComponentPeer implements ButtonPeer void fireClick(int modifiers) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((Button)owner).getActionCommand(), - System.currentTimeMillis(), - modifiers); + ActionEvent.ACTION_PERFORMED, + ((Button)owner).getActionCommand(), + System.currentTimeMillis(), + modifiers); QtToolkit.eventQueue.postEvent(e); } // ************ Public methods ********************* - + public native void setLabel( String label ); } - - - - diff --git a/gnu/java/awt/peer/qt/QtCheckboxPeer.java b/gnu/java/awt/peer/qt/QtCheckboxPeer.java index acac5e460..37fb51c48 100644 --- a/gnu/java/awt/peer/qt/QtCheckboxPeer.java +++ b/gnu/java/awt/peer/qt/QtCheckboxPeer.java @@ -50,18 +50,18 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer // Map QButtonGroup<->CheckboxGroup private static WeakHashMap groupMap; - static + static { groupMap = new WeakHashMap(); } - + public QtCheckboxPeer( QtToolkit kit, Checkbox owner ) { super( kit, owner ); } - + protected native void init(); - + protected void setup() { super.setup(); @@ -73,32 +73,32 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer private void fireToggle(boolean checked) { if (group == null) - ((Checkbox)owner).setState( checked ); + ((Checkbox)owner).setState( checked ); else if ( checked ) - group.setSelectedCheckbox((Checkbox)owner); + group.setSelectedCheckbox((Checkbox)owner); int sel = checked ? ItemEvent.SELECTED : ItemEvent.DESELECTED; - ItemEvent e = new ItemEvent((Checkbox)owner, - ItemEvent.ITEM_STATE_CHANGED, - ((Checkbox)owner).getLabel(), - sel); + ItemEvent e = new ItemEvent((Checkbox)owner, + ItemEvent.ITEM_STATE_CHANGED, + ((Checkbox)owner).getLabel(), + sel); QtToolkit.eventQueue.postEvent(e); } - + // ************ Public methods ********************* - + public void setCheckboxGroup( CheckboxGroup group ) - { - if(this.group == group) + { + if(this.group == group) return; // if we change from a checkbox to a radio button or vice versa if((this.group == null) != (group == null)) { - this.group = group; - callInit(); - setup(); + this.group = group; + callInit(); + setup(); } this.group = group; @@ -109,5 +109,3 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer public native void setState( boolean state ); } - - diff --git a/gnu/java/awt/peer/qt/QtChoicePeer.java b/gnu/java/awt/peer/qt/QtChoicePeer.java index 30674b36e..d279468cd 100644 --- a/gnu/java/awt/peer/qt/QtChoicePeer.java +++ b/gnu/java/awt/peer/qt/QtChoicePeer.java @@ -47,16 +47,16 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer { super( kit, owner ); } - + protected native void init(); protected void setup() { super.setup(); - + Choice c = (Choice) owner; int n = c.getItemCount(); - for ( int i = 0; i < n ; i++ ) + for ( int i = 0; i < n ; i++ ) add( c.getItem( i ), i ); select( c.getSelectedIndex() ); } @@ -64,10 +64,10 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer private void fireChoice( int index ) { ((Choice)owner).select( index ); - ItemEvent e = new ItemEvent((Choice)owner, - ItemEvent.ITEM_STATE_CHANGED, - ((Choice)owner).getItem(index), - ItemEvent.SELECTED); + ItemEvent e = new ItemEvent((Choice)owner, + ItemEvent.ITEM_STATE_CHANGED, + ((Choice)owner).getItem(index), + ItemEvent.SELECTED); QtToolkit.eventQueue.postEvent(e); } @@ -91,5 +91,3 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer public native void select( int index ); } - - diff --git a/gnu/java/awt/peer/qt/QtComponentGraphics.java b/gnu/java/awt/peer/qt/QtComponentGraphics.java index c5c839e32..27e12e659 100644 --- a/gnu/java/awt/peer/qt/QtComponentGraphics.java +++ b/gnu/java/awt/peer/qt/QtComponentGraphics.java @@ -43,8 +43,8 @@ import java.awt.Graphics; import java.awt.Rectangle; /** - * QtComponentPainter is a Graphics2D context for painting directly to AWT - * components. They require an existing QPainter object (the one passed into + * QtComponentPainter is a Graphics2D context for painting directly to AWT + * components. They require an existing QPainter object (the one passed into * the native paint method), and are created there (ONLY). * * Since this context does direct on-screen drawing it is NOT thread-safe, @@ -63,15 +63,15 @@ public class QtComponentGraphics extends QtGraphics * * @param ptr the pointer to the QPainter object. */ - public QtComponentGraphics(long ptr, QtComponentPeer component, - int x, int y, int w, int h) + public QtComponentGraphics(long ptr, QtComponentPeer component, + int x, int y, int w, int h) { nativeObject = ptr; peer = component; Rectangle r = new Rectangle(x, y, w, h); initialClip = r; - + setAlpha( 1.0 ); Color c = component.owner.getBackground(); if(c == null) @@ -103,11 +103,11 @@ public class QtComponentGraphics extends QtGraphics /** * This is a tricky one - */ - public void copyArea(int x, int y, int width, int height, - int dx, int dy) + */ + public void copyArea(int x, int y, int width, int height, + int dx, int dy) { - // FIXME + // FIXME } /** @@ -117,6 +117,4 @@ public class QtComponentGraphics extends QtGraphics { return peer.getGraphicsConfiguration(); } -} - - +} diff --git a/gnu/java/awt/peer/qt/QtComponentPeer.java b/gnu/java/awt/peer/qt/QtComponentPeer.java index 334f59088..16149b2e6 100644 --- a/gnu/java/awt/peer/qt/QtComponentPeer.java +++ b/gnu/java/awt/peer/qt/QtComponentPeer.java @@ -66,7 +66,7 @@ import java.awt.event.ComponentEvent; // 100% import java.awt.event.FocusEvent; // 100% import java.awt.event.InputEvent; // (abstract) import java.awt.event.KeyEvent; // 2/3 -import java.awt.event.MouseEvent; // 70%? +import java.awt.event.MouseEvent; // 70%? import java.awt.event.PaintEvent; // Yup. import java.awt.event.WindowEvent; // 2/ 12 import java.util.Timer; @@ -117,16 +117,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer this.toolkit = kit; qtApp = QtToolkit.guiThread.QApplicationPointer; nativeObject = 0; - synchronized(this) + synchronized(this) { - callInit(); // Calls the init method FROM THE MAIN THREAD. - try - { - wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + callInit(); // Calls the init method FROM THE MAIN THREAD. + try + { + wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } setup(); hasMotionListeners = false; @@ -147,30 +147,30 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer settingUp = true; if (owner != null) { - if (owner instanceof javax.swing.JComponent) - setBackground(owner.getBackground()); - else - owner.setBackground(getNativeBackground()); - - if (owner.getForeground() != null) - setForeground(owner.getForeground()); - else - setForeground( Color.black ); - - if (owner.getCursor() != null) - if (owner.getCursor().getType() != Cursor.DEFAULT_CURSOR) - setCursor(owner.getCursor()); - - if (owner.getFont() != null) - setFont(owner.getFont()); - - setEnabled( owner.isEnabled() ); - - backBuffer = null; - updateBounds(); - - setVisible( owner.isVisible() ); - QtToolkit.repaintThread.queueComponent(this); + if (owner instanceof javax.swing.JComponent) + setBackground(owner.getBackground()); + else + owner.setBackground(getNativeBackground()); + + if (owner.getForeground() != null) + setForeground(owner.getForeground()); + else + setForeground( Color.black ); + + if (owner.getCursor() != null) + if (owner.getCursor().getType() != Cursor.DEFAULT_CURSOR) + setCursor(owner.getCursor()); + + if (owner.getFont() != null) + setFont(owner.getFont()); + + setEnabled( owner.isEnabled() ); + + backBuffer = null; + updateBounds(); + + setVisible( owner.isVisible() ); + QtToolkit.repaintThread.queueComponent(this); } settingUp = false; } @@ -189,9 +189,9 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer private boolean drawableComponent() { - return ((this instanceof QtContainerPeer && - !(this instanceof QtScrollPanePeer)) || - (this instanceof QtCanvasPeer)); + return ((this instanceof QtContainerPeer && + !(this instanceof QtScrollPanePeer)) || + (this instanceof QtCanvasPeer)); } void updateBounds() @@ -204,19 +204,19 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if(width <= 0 || height <= 0) return; - + if( !drawableComponent() && backBuffer == null) return; if( backBuffer != null ) { - if( width < backBuffer.width && height < backBuffer.height ) - return; - backBuffer.dispose(); + if( width < backBuffer.width && height < backBuffer.height ) + return; + backBuffer.dispose(); } backBuffer = new QtImage(width, height); } - + // ************ Event methods ********************* @@ -227,18 +227,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if (owner instanceof Window) { - WindowEvent e = new WindowEvent((Window)owner, - WindowEvent.WINDOW_CLOSING); - QtToolkit.eventQueue.postEvent(e); + WindowEvent e = new WindowEvent((Window)owner, + WindowEvent.WINDOW_CLOSING); + QtToolkit.eventQueue.postEvent(e); } } protected void enterEvent(int modifiers, int x, int y, int dummy) { - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_ENTERED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, 0, false); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_ENTERED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, 0, false); QtToolkit.eventQueue.postEvent(e); } @@ -257,31 +257,31 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer protected void keyPressEvent(int modifiers, int code, int unicode, int dummy) { KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager (); - KeyEvent e = new KeyEvent(owner, - KeyEvent.KEY_PRESSED, - System.currentTimeMillis(), - modifiers, code, (char)(unicode & 0xFFFF), - KeyEvent.KEY_LOCATION_UNKNOWN); + KeyEvent e = new KeyEvent(owner, + KeyEvent.KEY_PRESSED, + System.currentTimeMillis(), + modifiers, code, (char)(unicode & 0xFFFF), + KeyEvent.KEY_LOCATION_UNKNOWN); if (!manager.dispatchEvent (e)) QtToolkit.eventQueue.postEvent(e); } protected void keyReleaseEvent(int modifiers, int code, int unicode, int dummy) { - KeyEvent e = new KeyEvent(owner, - KeyEvent.KEY_RELEASED, - System.currentTimeMillis(), - modifiers, code, (char)(unicode & 0xFFFF), - KeyEvent.KEY_LOCATION_UNKNOWN); + KeyEvent e = new KeyEvent(owner, + KeyEvent.KEY_RELEASED, + System.currentTimeMillis(), + modifiers, code, (char)(unicode & 0xFFFF), + KeyEvent.KEY_LOCATION_UNKNOWN); QtToolkit.eventQueue.postEvent(e); } protected void leaveEvent(int modifiers, int x, int y, int dummy) { - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_EXITED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, 0, false); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_EXITED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, 0, false); QtToolkit.eventQueue.postEvent(e); } @@ -291,17 +291,17 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_CLICKED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_CLICKED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -311,21 +311,21 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == - InputEvent.BUTTON3_DOWN_MASK) button = 3; + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + InputEvent.BUTTON3_DOWN_MASK) button = 3; - int type = (button != 0) ? + int type = (button != 0) ? MouseEvent.MOUSE_DRAGGED :MouseEvent.MOUSE_MOVED; - - MouseEvent e = new MouseEvent(owner, - type, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + + MouseEvent e = new MouseEvent(owner, + type, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -334,18 +334,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_PRESSED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - ( button == POPUP_TRIGGER ), - button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_PRESSED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + ( button == POPUP_TRIGGER ), + button); QtToolkit.eventQueue.postEvent(e); } @@ -354,18 +354,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_RELEASED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_RELEASED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -373,16 +373,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if( !ignoreResize ) { - // Since Component.setLocation calls back to setBounds, - // we need to ignore that. - ignoreResize = true; - owner.setLocation( x, y ); - ignoreResize = false; + // Since Component.setLocation calls back to setBounds, + // we need to ignore that. + ignoreResize = true; + owner.setLocation( x, y ); + ignoreResize = false; } } - protected void resizeEvent(int oldWidth, int oldHeight, - int width, int height) + protected void resizeEvent(int oldWidth, int oldHeight, + int width, int height) { if(!(owner instanceof Window)) return; @@ -390,8 +390,8 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer ignoreResize = true; owner.setSize(width, height); ignoreResize = false; - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_RESIZED); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_RESIZED); QtToolkit.eventQueue.postEvent(e); QtToolkit.repaintThread.queueComponent(this); } @@ -400,22 +400,22 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if (owner instanceof Window) { - WindowEvent e = new WindowEvent((Window)owner, - WindowEvent.WINDOW_OPENED); - QtToolkit.eventQueue.postEvent(e); + WindowEvent e = new WindowEvent((Window)owner, + WindowEvent.WINDOW_OPENED); + QtToolkit.eventQueue.postEvent(e); } - else + else { - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_SHOWN); - QtToolkit.eventQueue.postEvent(e); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_SHOWN); + QtToolkit.eventQueue.postEvent(e); } } protected void hideEvent() { - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_HIDDEN); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_HIDDEN); QtToolkit.eventQueue.postEvent(e); } @@ -431,18 +431,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public boolean canDetermineObscurity() { return true; - } + } public int checkImage(Image img, - int w, - int h, - ImageObserver o) + int w, + int h, + ImageObserver o) { return toolkit.checkImage(img, w, h, o); } public void createBuffers(int numBuffers, BufferCapabilities caps) - throws AWTException + throws AWTException { // FIXME } @@ -516,9 +516,9 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public Graphics getGraphics() { if( backBuffer == null ) - { - Rectangle r = owner.getBounds(); - backBuffer = new QtImage( r.width, r.height ); + { + Rectangle r = owner.getBounds(); + backBuffer = new QtImage( r.width, r.height ); } return backBuffer.getDirectGraphics( this ); } @@ -533,16 +533,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public Point getLocationOnScreen() { Point p = new Point(); - synchronized( p ) + synchronized( p ) { - getLocationOnScreenNative( p ); - try - { - p.wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + getLocationOnScreenNative( p ); + try + { + p.wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } return p; } @@ -552,16 +552,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer private Dimension getSize(boolean preferred) { Dimension d = new Dimension(); - synchronized( d ) + synchronized( d ) { - getSizeNative(d, preferred); - try - { - d.wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + getSizeNative(d, preferred); + try + { + d.wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } return d; } @@ -570,7 +570,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { return getSize( false ); } - + public Dimension getPreferredSize() { return getSize( true ); @@ -582,7 +582,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer } public native boolean handlesWheelScrolling(); - + public void hide() { setVisible(false); @@ -610,17 +610,17 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public native void requestFocus(); - public boolean requestFocus (Component source, boolean bool1, - boolean bool2, long x) + public boolean requestFocus (Component source, boolean bool1, + boolean bool2, long x) { // FIXME return true; } public void reshape(int x, - int y, - int width, - int height) + int y, + int width, + int height) { setBounds( x, y, width, height ); } @@ -662,7 +662,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer return; setGround(c.getRed(), c.getGreen(), c.getBlue(), true); } - + public native void setVisible(boolean b); public void show() @@ -678,71 +678,71 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer switch (eventID) { case ComponentEvent.COMPONENT_SHOWN: - QtToolkit.repaintThread.queueComponent(this); + QtToolkit.repaintThread.queueComponent(this); break; case PaintEvent.PAINT: - case PaintEvent.UPDATE: - r = ((PaintEvent)e).getUpdateRect(); - QtToolkit.repaintThread.queueComponent(this, r.x, r.y, - r.width, r.height); + case PaintEvent.UPDATE: + r = ((PaintEvent)e).getUpdateRect(); + QtToolkit.repaintThread.queueComponent(this, r.x, r.y, + r.width, r.height); break; case KeyEvent.KEY_PRESSED: - break; + break; case KeyEvent.KEY_RELEASED: - break; + break; } } /** * paint() is called back from the native side in response to a native * repaint event. - */ + */ public void paint(Graphics g) { Rectangle r = g.getClipBounds(); if (backBuffer != null) - backBuffer.drawPixelsScaledFlipped ((QtGraphics) g, - 0, 0, 0, /* bg colors */ - false, false, /* no flipping */ - r.x, r.y, r.width, r.height, - r.x, r.y, r.width, r.height, - false ); /* no compositing */ + backBuffer.drawPixelsScaledFlipped ((QtGraphics) g, + 0, 0, 0, /* bg colors */ + false, false, /* no flipping */ + r.x, r.y, r.width, r.height, + r.x, r.y, r.width, r.height, + false ); /* no compositing */ } public void paintBackBuffer() throws InterruptedException { if( backBuffer != null ) { - backBuffer.clear(); - Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); - owner.paint(bbg); - bbg.dispose(); + backBuffer.clear(); + Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); + owner.paint(bbg); + bbg.dispose(); } } - public void paintBackBuffer(int x, int y, int w, int h) + public void paintBackBuffer(int x, int y, int w, int h) throws InterruptedException { if( backBuffer != null ) { - Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); - bbg.setBackground( getNativeBackground() ); - bbg.clearRect(x, y, w, h); - bbg.setClip(x, y, w, h); - owner.paint(bbg); - bbg.dispose(); + Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); + bbg.setBackground( getNativeBackground() ); + bbg.clearRect(x, y, w, h); + bbg.setClip(x, y, w, h); + owner.paint(bbg); + bbg.dispose(); } } public boolean prepareImage(Image img, - int w, - int h, - ImageObserver o) + int w, + int h, + ImageObserver o) { return toolkit.prepareImage(img, w, h, o); } - + public void print(Graphics g) { // FIXME @@ -752,16 +752,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer * Schedules a timed repaint. */ public void repaint(long tm, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { if( tm <= 0 ) { - QtToolkit.repaintThread.queueComponent(this, x, y, w, h); - return; - } + QtToolkit.repaintThread.queueComponent(this, x, y, w, h); + return; + } Timer t = new Timer(); t.schedule(new RepaintTimerTask(this, x, y, w, h), tm); } @@ -778,20 +778,20 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer /** * Timed repainter */ - private class RepaintTimerTask extends TimerTask - { + private class RepaintTimerTask extends TimerTask + { private int x, y, w, h; private QtComponentPeer peer; RepaintTimerTask(QtComponentPeer peer, int x, int y, int w, int h) - { + { this.x=x; this.y=y; this.w=w; - this.h=h; + this.h=h; this.peer=peer; } public void run() - { + { QtToolkit.repaintThread.queueComponent(peer, x, y, w, h); } } @@ -808,7 +808,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public void setBounds(int x, int y, int width, int height, int z) { // TODO Auto-generated method stub - + } public boolean isReparentSupported() diff --git a/gnu/java/awt/peer/qt/QtContainerPeer.java b/gnu/java/awt/peer/qt/QtContainerPeer.java index ec04b0567..ee2873730 100644 --- a/gnu/java/awt/peer/qt/QtContainerPeer.java +++ b/gnu/java/awt/peer/qt/QtContainerPeer.java @@ -60,13 +60,13 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer // ************ Public methods ********************* public void beginLayout() { - // FIXME + // FIXME } public void beginValidate() { } - + public void endLayout() { QtUpdate(); @@ -75,7 +75,7 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer public void endValidate() { } - + public Insets getInsets() { return new Insets(0, 0, 0, 0); @@ -101,15 +101,12 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer public void cancelPendingPaint(int x, int y, int width, int height) { // TODO Auto-generated method stub - + } public void restack() { // TODO Auto-generated method stub - + } } - - - diff --git a/gnu/java/awt/peer/qt/QtDialogPeer.java b/gnu/java/awt/peer/qt/QtDialogPeer.java index 23e5c0653..2f2c25550 100644 --- a/gnu/java/awt/peer/qt/QtDialogPeer.java +++ b/gnu/java/awt/peer/qt/QtDialogPeer.java @@ -68,6 +68,6 @@ public class QtDialogPeer extends QtWindowPeer implements DialogPeer public void setBounds(int x, int y, int width, int height) { setBoundsNative(x, y, width, height, - !((Dialog)owner).isResizable()); + !((Dialog)owner).isResizable()); } } diff --git a/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java b/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java index 0f859b78e..de76cd17f 100644 --- a/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java +++ b/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java @@ -40,7 +40,7 @@ package gnu.java.awt.peer.qt; import java.awt.Component; import gnu.java.awt.peer.EmbeddedWindowPeer; -/** +/** * Embedded window peer for applets. * FIXME: EmbeddedWindowPeer and this class should extend Window, NOT Frame. */ @@ -50,7 +50,7 @@ public class QtEmbeddedWindowPeer extends QtFramePeer implements EmbeddedWindowP { super( kit, owner ); } - + protected native void init(); protected void setup() diff --git a/gnu/java/awt/peer/qt/QtFileDialogPeer.java b/gnu/java/awt/peer/qt/QtFileDialogPeer.java index 4937031aa..06943d955 100644 --- a/gnu/java/awt/peer/qt/QtFileDialogPeer.java +++ b/gnu/java/awt/peer/qt/QtFileDialogPeer.java @@ -81,4 +81,3 @@ public class QtFileDialogPeer extends QtDialogPeer implements FileDialogPeer // FIXME } } - diff --git a/gnu/java/awt/peer/qt/QtFontMetrics.java b/gnu/java/awt/peer/qt/QtFontMetrics.java index 3b182b5ea..1998339dc 100644 --- a/gnu/java/awt/peer/qt/QtFontMetrics.java +++ b/gnu/java/awt/peer/qt/QtFontMetrics.java @@ -93,7 +93,7 @@ public class QtFontMetrics extends FontMetrics native Rectangle2D getStringBounds(String s); // ****************** Package private *************************** - + native boolean canDisplay( int c ); // ****************** Public methods **************************** diff --git a/gnu/java/awt/peer/qt/QtFontPeer.java b/gnu/java/awt/peer/qt/QtFontPeer.java index bd16daf28..03ed1d2df 100644 --- a/gnu/java/awt/peer/qt/QtFontPeer.java +++ b/gnu/java/awt/peer/qt/QtFontPeer.java @@ -103,17 +103,17 @@ public class QtFontPeer extends ClasspathFontPeer return metrics.canDisplay( c ); } - public int canDisplayUpTo (Font font, CharacterIterator i, - int start, int limit) + public int canDisplayUpTo (Font font, CharacterIterator i, + int start, int limit) { int index = start; char c = i.setIndex( index ); while( index <= limit ) { - if(!canDisplay(font, c)) - return index; - index++; - c = i.next(); + if(!canDisplay(font, c)) + return index; + index++; + c = i.next(); } return -1; } @@ -149,23 +149,23 @@ public class QtFontPeer extends ClasspathFontPeer } public GlyphVector createGlyphVector (Font font, - FontRenderContext frc, - CharacterIterator ci) + FontRenderContext frc, + CharacterIterator ci) { throw new UnsupportedOperationException(); } - public GlyphVector createGlyphVector (Font font, - FontRenderContext ctx, - int[] glyphCodes) + public GlyphVector createGlyphVector (Font font, + FontRenderContext ctx, + int[] glyphCodes) { throw new UnsupportedOperationException(); } - public GlyphVector layoutGlyphVector (Font font, - FontRenderContext frc, - char[] chars, int start, - int limit, int flags) + public GlyphVector layoutGlyphVector (Font font, + FontRenderContext frc, + char[] chars, int start, + int limit, int flags) { throw new UnsupportedOperationException(); } @@ -180,16 +180,16 @@ public class QtFontPeer extends ClasspathFontPeer throw new UnsupportedOperationException(); } - public LineMetrics getLineMetrics (Font font, - CharacterIterator ci, - int begin, int limit, - FontRenderContext rc) + public LineMetrics getLineMetrics (Font font, + CharacterIterator ci, + int begin, int limit, + FontRenderContext rc) { throw new UnsupportedOperationException(); } - public Rectangle2D getMaxCharBounds (Font font, - FontRenderContext rc) + public Rectangle2D getMaxCharBounds (Font font, + FontRenderContext rc) { throw new UnsupportedOperationException(); } diff --git a/gnu/java/awt/peer/qt/QtFramePeer.java b/gnu/java/awt/peer/qt/QtFramePeer.java index e3b578933..d5162106f 100644 --- a/gnu/java/awt/peer/qt/QtFramePeer.java +++ b/gnu/java/awt/peer/qt/QtFramePeer.java @@ -75,7 +75,7 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer private native int menuBarHeight(); // ************ Public methods ********************* - + public void destroy() { dispose(); @@ -83,13 +83,13 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer public int getState() { - // FIXME + // FIXME return theState; } public Insets getInsets() { - int mbHeight = ( ((Frame)owner).getMenuBar() != null ) ? + int mbHeight = ( ((Frame)owner).getMenuBar() != null ) ? menuBarHeight() : 0; return new Insets(mbHeight, 0, 0, 0); } @@ -98,30 +98,30 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer { if (im instanceof QtImage) setIcon( (QtImage)im ); - else + else setIcon( new QtImage( im.getSource() ) ); } public void setMaximizedBounds(Rectangle rect) { // FIXME - } + } public void setMenuBar(MenuBar mb) { if( mb != null ) { - QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer(); - if( mbpeer == null ) - { - mb.addNotify(); - mbpeer = (QtMenuBarPeer)mb.getPeer(); - if( mbpeer == null ) - throw new IllegalStateException("No menu bar peer."); - } - mbpeer.addMenus(); - setMenu( mbpeer ); - } + QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer(); + if( mbpeer == null ) + { + mb.addNotify(); + mbpeer = (QtMenuBarPeer)mb.getPeer(); + if( mbpeer == null ) + throw new IllegalStateException("No menu bar peer."); + } + mbpeer.addMenus(); + setMenu( mbpeer ); + } else setMenu( null ); } @@ -140,13 +140,13 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer public void setBoundsPrivate(int x, int y, int width, int height) { // TODO Auto-generated method stub - + } public void updateAlwaysOnTop() { // TODO Auto-generated method stub - + } public boolean requestWindowFocus() diff --git a/gnu/java/awt/peer/qt/QtGraphics.java b/gnu/java/awt/peer/qt/QtGraphics.java index 5694e8d20..f68cc0dbd 100644 --- a/gnu/java/awt/peer/qt/QtGraphics.java +++ b/gnu/java/awt/peer/qt/QtGraphics.java @@ -75,7 +75,7 @@ import java.util.Map; /** * QtGraphics is an abstract implementation of Graphics2D over a QPainter - * object. This is to be subclassed for different drawing contexts, + * object. This is to be subclassed for different drawing contexts, * which may have different requirements. */ public abstract class QtGraphics extends Graphics2D @@ -100,9 +100,9 @@ public abstract class QtGraphics extends Graphics2D protected Paint currentPaint; // current paint protected RenderingHints renderingHints; // the rendering hints. - /** + /** * Owner Graphics, used by subcontext created by create() - * to avoid GC of the original context. + * to avoid GC of the original context. */ Graphics parent; @@ -154,12 +154,12 @@ public abstract class QtGraphics extends Graphics2D { AffineTransform current = getTransform(); setTransform( identity ); - setClip( initialClip ); + setClip( initialClip ); setTransform( current ); } - protected native void initImage(QtImage image); - protected native void initVolatileImage(QtVolatileImage image); + protected native void initImage(QtImage image); + protected native void initVolatileImage(QtVolatileImage image); // Creates a new native QPainter object on the same context. private native void cloneNativeContext( QtGraphics parent ); @@ -174,10 +174,10 @@ public abstract class QtGraphics extends Graphics2D private native void setNativeStroke(QPen p); private native void setNativeComposite(int alphaMode); private native void drawStringNative(String string, double x, double y); - private native void setLinearGradient(int r1, int g1, int b1, - int r2, int g2, int b2, - double x1, double y1, - double x2, double y2, boolean cyclic); + private native void setLinearGradient(int r1, int g1, int b1, + int r2, int g2, int b2, + double x1, double y1, + double x2, double y2, boolean cyclic); private native void setAlphaNative(double alpha); private native void setFontNative(QtFontPeer font); private native QPainterPath getClipNative(); @@ -195,8 +195,8 @@ public abstract class QtGraphics extends Graphics2D */ public abstract Graphics create(); - public abstract void copyArea(int x, int y, int width, int height, - int dx, int dy); + public abstract void copyArea(int x, int y, int width, int height, + int dx, int dy); public abstract GraphicsConfiguration getDeviceConfiguration(); @@ -210,7 +210,7 @@ public abstract class QtGraphics extends Graphics2D { if( c == null ) c = Color.white; - this.color = c; + this.color = c; int alpha = (int)(c.getAlpha() * currentAlpha); setColor(c.getRed(), c.getGreen(), c.getBlue(), alpha); } @@ -238,15 +238,15 @@ public abstract class QtGraphics extends Graphics2D { if( onStroke ) { - Shape stroked = currentStroke.createStrokedShape( s ); - return stroked.intersects( (double)rect.x, (double)rect.y, - (double)rect.width, (double)rect.height ); + Shape stroked = currentStroke.createStrokedShape( s ); + return stroked.intersects( (double)rect.x, (double)rect.y, + (double)rect.width, (double)rect.height ); } - return s.intersects( (double)rect.x, (double)rect.y, - (double)rect.width, (double)rect.height ); + return s.intersects( (double)rect.x, (double)rect.y, + (double)rect.width, (double)rect.height ); } - // ******************* Font *********************** + // ******************* Font *********************** public Font getFont() { return font; @@ -287,7 +287,7 @@ public abstract class QtGraphics extends Graphics2D } public Shape getClip() - { + { return getClipNative().getPath(); } @@ -307,7 +307,7 @@ public abstract class QtGraphics extends Graphics2D // ***************** Drawing primitives ********************* public void draw(Shape s) - { + { if( nativeStroking ) drawNative( new QPainterPath(s) ); else @@ -330,14 +330,14 @@ public abstract class QtGraphics extends Graphics2D public void drawRect(int x, int y, int width, int height) { if( nativeStroking ) - drawNative( new QPainterPath((double)x, (double)y, - (double)width, (double)height) ); + drawNative( new QPainterPath((double)x, (double)y, + (double)width, (double)height) ); else fillNative( new QPainterPath - ( currentStroke.createStrokedShape - (new Rectangle2D.Double - ((double)x, (double)y, - (double)width, (double)height) ) ) ); + ( currentStroke.createStrokedShape + (new Rectangle2D.Double + ((double)x, (double)y, + (double)width, (double)height) ) ) ); } public void fillRect(int x, int y, int width, int height) @@ -353,24 +353,24 @@ public abstract class QtGraphics extends Graphics2D setColor( c ); } - public void drawRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void drawRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { - draw( new RoundRectangle2D.Double(x, y, width, height, - arcWidth, arcHeight) ); + draw( new RoundRectangle2D.Double(x, y, width, height, + arcWidth, arcHeight) ); } - public void fillRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void fillRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { - fill( new RoundRectangle2D.Double(x, y, width, height, - arcWidth, arcHeight) ); + fill( new RoundRectangle2D.Double(x, y, width, height, + arcWidth, arcHeight) ); } public void drawOval(int x, int y, int width, int height) { - draw( new Ellipse2D.Double((double)x, (double)y, - (double)width, (double)height) ); + draw( new Ellipse2D.Double((double)x, (double)y, + (double)width, (double)height) ); } public void fillOval(int x, int y, int width, int height) @@ -378,18 +378,18 @@ public abstract class QtGraphics extends Graphics2D fill( new Ellipse2D.Double(x, y, width, height) ); } - public void drawArc(int x, int y, int width, int height, - int arcStart, int arcAngle) + public void drawArc(int x, int y, int width, int height, + int arcStart, int arcAngle) { - draw( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, - Arc2D.OPEN) ); + draw( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, + Arc2D.OPEN) ); } - public void fillArc(int x, int y, int width, int height, - int arcStart, int arcAngle) + public void fillArc(int x, int y, int width, int height, + int arcStart, int arcAngle) { - fill( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, - Arc2D.CHORD) ); + fill( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, + Arc2D.CHORD) ); } public void drawPolyline(int xPoints[], int yPoints[], int npoints) @@ -428,17 +428,17 @@ public abstract class QtGraphics extends Graphics2D { // FIXME - to something more correct ? String s = ""; - for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) + for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) s += c; drawString(s, x, y); } - public void drawString(AttributedCharacterIterator ci, - float x, float y) + public void drawString(AttributedCharacterIterator ci, + float x, float y) { // FIXME - to something more correct ? String s = ""; - for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) + for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) s += c; drawString(s, x, y); } @@ -450,68 +450,68 @@ public abstract class QtGraphics extends Graphics2D // ******************* Image drawing ****************************** public boolean drawImage(Image image, - AffineTransform Tx, - ImageObserver obs) + AffineTransform Tx, + ImageObserver obs) { if (image instanceof QtImage) return ((QtImage)image).drawImage(this, new QMatrix( Tx ), obs); - return (new QtImage(image.getSource())).drawImage(this, - new QMatrix( Tx ), - obs); + return (new QtImage(image.getSource())).drawImage(this, + new QMatrix( Tx ), + obs); } - public boolean drawImage(Image image, int x, int y, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, Color bgcolor, + ImageObserver observer) { if (image instanceof QtImage) return ((QtImage)image).drawImage (this, x, y, bgcolor, observer); - return (new QtImage(image.getSource())).drawImage (this, x, y, - bgcolor, observer); + return (new QtImage(image.getSource())).drawImage (this, x, y, + bgcolor, observer); } - public boolean drawImage(Image image, - int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage(Image image, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { if (image instanceof QtImage) - return ((QtImage)image).drawImage(this, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, bgcolor, observer); + return ((QtImage)image).drawImage(this, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, bgcolor, observer); - return (new QtImage(image.getSource())).drawImage(this, dx1, dy1, - dx2, dy2, - sx1, sy1, sx2, sy2, - bgcolor, observer); + return (new QtImage(image.getSource())).drawImage(this, dx1, dy1, + dx2, dy2, + sx1, sy1, sx2, sy2, + bgcolor, observer); } - public boolean drawImage(Image image, int x, int y, - int width, int height, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, + int width, int height, Color bgcolor, + ImageObserver observer) { if (image instanceof QtImage) - return ((QtImage)image).drawImage (this, x, y, width, height, - bgcolor, observer); - return (new QtImage(image.getSource())).drawImage (this, x, y, - width, height, - bgcolor, observer); + return ((QtImage)image).drawImage (this, x, y, width, height, + bgcolor, observer); + return (new QtImage(image.getSource())).drawImage (this, x, y, + width, height, + bgcolor, observer); } - - public boolean drawImage(Image image, int x, int y, int width, int height, - ImageObserver observer) + + public boolean drawImage(Image image, int x, int y, int width, int height, + ImageObserver observer) { return drawImage(image, x, y, width, height, null, observer); } - + public boolean drawImage(Image image, int x, int y, ImageObserver observer) { return drawImage(image, x, y, null, observer); } - + public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver observer) { - return drawImage(image, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, null, observer); + return drawImage(image, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, null, observer); } // *********************** Transform methods ************************* @@ -531,7 +531,7 @@ public abstract class QtGraphics extends Graphics2D xform.rotate( theta ); setQtTransform( new QMatrix( xform ) ); } - + public void rotate(double theta, double x, double y) { xform.rotate(theta, x, y); @@ -549,7 +549,7 @@ public abstract class QtGraphics extends Graphics2D xform.shear(shx, shy); setQtTransform( new QMatrix( xform ) ); } - + public void transform(AffineTransform Tx) { xform.concatenate( Tx ); @@ -572,14 +572,14 @@ public abstract class QtGraphics extends Graphics2D { try // ..to convert the stroke into a native one. { - QPen pen = new QPen( s ); - nativeStroking = true; - setNativeStroke( pen ); - setColor( color ); - } + QPen pen = new QPen( s ); + nativeStroking = true; + setNativeStroke( pen ); + setColor( color ); + } catch (IllegalArgumentException e) { - nativeStroking = false; + nativeStroking = false; } currentStroke = s; } @@ -593,27 +593,27 @@ public abstract class QtGraphics extends Graphics2D { if( comp == null) { - setNativeComposite( AlphaComposite.SRC_OVER ); - return; + setNativeComposite( AlphaComposite.SRC_OVER ); + return; } if( comp instanceof AlphaComposite ) { - if( ((AlphaComposite)comp).getRule() != AlphaComposite.XOR ) - setAlpha( ((AlphaComposite)comp).getAlpha() ); - setNativeComposite( ((AlphaComposite)comp).getRule() ); - composite = comp; + if( ((AlphaComposite)comp).getRule() != AlphaComposite.XOR ) + setAlpha( ((AlphaComposite)comp).getAlpha() ); + setNativeComposite( ((AlphaComposite)comp).getRule() ); + composite = comp; } else { - // FIXME: this check is only required "if this Graphics2D - // context is drawing to a Component on the display screen". - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkPermission(new AWTPermission("readDisplayPixels")); - - throw new UnsupportedOperationException("We don't support custom"+ - " composites yet."); + // FIXME: this check is only required "if this Graphics2D + // context is drawing to a Component on the display screen". + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new AWTPermission("readDisplayPixels")); + + throw new UnsupportedOperationException("We don't support custom"+ + " composites yet."); } } @@ -625,28 +625,28 @@ public abstract class QtGraphics extends Graphics2D public void setPaint(Paint p) { if( p == null ) - return; + return; // FIXME currentPaint = p; if( p instanceof GradientPaint ) { - GradientPaint lg = (GradientPaint)p; - setLinearGradient(lg.getColor1().getRed(), lg.getColor1().getGreen(), - lg.getColor1().getBlue(), lg.getColor2().getRed(), - lg.getColor2().getGreen(), lg.getColor2().getBlue(), - lg.getPoint1().getX(), lg.getPoint1().getY(), - lg.getPoint2().getX(), lg.getPoint2().getY(), - lg.isCyclic() ); - return; + GradientPaint lg = (GradientPaint)p; + setLinearGradient(lg.getColor1().getRed(), lg.getColor1().getGreen(), + lg.getColor1().getBlue(), lg.getColor2().getRed(), + lg.getColor2().getGreen(), lg.getColor2().getBlue(), + lg.getPoint1().getX(), lg.getPoint1().getY(), + lg.getPoint2().getX(), lg.getPoint2().getY(), + lg.isCyclic() ); + return; } if( p instanceof Color ) { - setColor((Color) p); - return; + setColor((Color) p); + return; } throw new UnsupportedOperationException("We don't support custom"+ - " paints yet."); + " paints yet."); } public Paint getPaint() @@ -671,7 +671,7 @@ public abstract class QtGraphics extends Graphics2D { return (RenderingHints) renderingHints.clone(); } - + public void setRenderingHints(Map<?,?> hints) { renderingHints = new RenderingHints( null ); @@ -711,5 +711,4 @@ public abstract class QtGraphics extends Graphics2D { throw new UnsupportedOperationException("Not implemented yet"); } -} - +} diff --git a/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java b/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java index 15a015922..dec4db2c8 100644 --- a/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java +++ b/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java @@ -55,7 +55,7 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment toolkit = tk; // Get the number of screens from Qt. int n = toolkit.numScreens(); - + /** * Create the screen device objects */ @@ -77,7 +77,7 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment { return toolkit.getFontList(); } - + public String[] getAvailableFontFamilyNames(Locale l) { return getAvailableFontFamilyNames(); @@ -103,5 +103,3 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment return toolkit; } } - - diff --git a/gnu/java/awt/peer/qt/QtImage.java b/gnu/java/awt/peer/qt/QtImage.java index b6fbb1dca..b7e50ea25 100644 --- a/gnu/java/awt/peer/qt/QtImage.java +++ b/gnu/java/awt/peer/qt/QtImage.java @@ -95,11 +95,11 @@ public class QtImage extends Image /* * The 32-bit AARRGGBB format the uses. */ - static ColorModel nativeModel = new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + static ColorModel nativeModel = new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); /** * HashMap of Graphics objects painting on this Image. */ @@ -126,7 +126,7 @@ public class QtImage extends Image private native void setPixels(int[] pixels); /** - * Loads an image + * Loads an image */ private native boolean loadImage(String name); @@ -153,35 +153,35 @@ public class QtImage extends Image /** * Draws the image optionally composited. */ - native void drawPixels (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, - boolean composite); + native void drawPixels (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, + boolean composite); /** * Draws the image, optionally scaled and composited. */ - private native void drawPixelsScaled (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, int width, int height, - boolean composite); + private native void drawPixelsScaled (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, int width, int height, + boolean composite); /** * Draws the image transformed. */ private native void drawPixelsTransformed (QtGraphics gc, QMatrix transform); - + /** * Draws the image scaled flipped and optionally composited. */ - native void drawPixelsScaledFlipped (QtGraphics gc, - int bg_red, int bg_green, - int bg_blue, - boolean flipX, boolean flipY, - int srcX, int srcY, - int srcWidth, int srcHeight, - int dstX, int dstY, - int dstWidth, int dstHeight, - boolean composite); + native void drawPixelsScaledFlipped (QtGraphics gc, + int bg_red, int bg_green, + int bg_blue, + boolean flipX, boolean flipY, + int srcX, int srcY, + int srcWidth, int srcHeight, + int dstX, int dstY, + int dstWidth, int dstHeight, + boolean composite); /** * Creates the image from an ImageProducer. May result in an error image. @@ -216,13 +216,13 @@ public class QtImage extends Image byte[] buf = new byte[5000]; int n = 0; - while ( (n = bis.read( buf )) != -1 ) - baos.write(buf, 0, n); + while ( (n = bis.read( buf )) != -1 ) + baos.write(buf, 0, n); bis.close(); } catch(IOException e) { - throw new IllegalArgumentException("Couldn't load image."); + throw new IllegalArgumentException("Couldn't load image."); } if ( loadImageFromData( baos.toByteArray() ) != true ) throw new IllegalArgumentException("Couldn't load image."); @@ -245,19 +245,19 @@ public class QtImage extends Image props = new Hashtable(); try { - String fn = f.getCanonicalPath(); - if (loadImage( fn ) != true) - { - errorLoading = true; - isLoaded = false; - return; - } - } + String fn = f.getCanonicalPath(); + if (loadImage( fn ) != true) + { + errorLoading = true; + isLoaded = false; + return; + } + } catch(IOException e) { - errorLoading = true; - isLoaded = false; - return; + errorLoading = true; + isLoaded = false; + return; } errorLoading = false; isLoaded = true; @@ -315,8 +315,8 @@ public class QtImage extends Image /** * Callback from the image consumer. */ - public void setImage(int width, int height, - int[] pixels, Hashtable properties) + public void setImage(int width, int height, + int[] pixels, Hashtable properties) { this.width = width; this.height = height; @@ -324,8 +324,8 @@ public class QtImage extends Image if (width <= 0 || height <= 0 || pixels == null) { - errorLoading = true; - return; + errorLoading = true; + return; } isLoaded = true; @@ -343,12 +343,12 @@ public class QtImage extends Image return width; } - + public int getHeight (ImageObserver observer) { if (addObserver(observer)) return -1; - + return height; } @@ -356,7 +356,7 @@ public class QtImage extends Image { if (addObserver(observer)) return UndefinedProperty; - + Object value = props.get (name); return (value == null) ? UndefinedProperty : value; } @@ -368,8 +368,8 @@ public class QtImage extends Image { if (!isLoaded) return null; - return new MemoryImageSource(width, height, nativeModel, getPixels(), - 0, width); + return new MemoryImageSource(width, height, nativeModel, getPixels(), + 0, width); } void putPainter(QtImageGraphics g) @@ -391,7 +391,7 @@ public class QtImage extends Image */ public Graphics getGraphics () { - if (!isLoaded || killFlag) + if (!isLoaded || killFlag) return null; return new QtImageGraphics(this); @@ -402,28 +402,28 @@ public class QtImage extends Image */ Graphics getDirectGraphics(QtComponentPeer peer) { - if (!isLoaded) + if (!isLoaded) return null; return new QtImageDirectGraphics(this, peer); } - + /** * Returns a scaled instance of this image. */ public Image getScaledInstance(int width, - int height, - int hints) + int height, + int hints) { if (width <= 0 || height <= 0) throw new IllegalArgumentException("Width and height of scaled bitmap"+ - "must be >= 0"); + "must be >= 0"); return new QtImage(this, width, height, hints); } /** - * If the image is loaded and comes from an ImageProducer, + * If the image is loaded and comes from an ImageProducer, * regenerate the image from there. * * I have no idea if this is ever actually used. Since QtImage can't be @@ -434,10 +434,10 @@ public class QtImage extends Image { if (isLoaded && source != null) { - observers = new Vector(); - isLoaded = false; - freeImage(); - source.startProduction(new QtImageConsumer(this, source)); + observers = new Vector(); + isLoaded = false; + freeImage(); + source.startProduction(new QtImageConsumer(this, source)); } } @@ -450,11 +450,11 @@ public class QtImage extends Image { if (isLoaded) { - if( painters == null || painters.isEmpty() ) - freeImage(); - else - killFlag = true; // can't destroy image yet. - // Do so when all painters are gone. + if( painters == null || painters.isEmpty() ) + freeImage(); + else + killFlag = true; // can't destroy image yet. + // Do so when all painters are gone. } } @@ -465,12 +465,12 @@ public class QtImage extends Image { if (addObserver(observer)) { - if (errorLoading == true) - return ImageObserver.ERROR; - else - return 0; + if (errorLoading == true) + return ImageObserver.ERROR; + else + return 0; } - + return ImageObserver.ALLBITS | ImageObserver.WIDTH | ImageObserver.HEIGHT; } @@ -480,7 +480,7 @@ public class QtImage extends Image * Draws an image with eventual scaling/transforming. */ public boolean drawImage (QtGraphics g, QMatrix matrix, - ImageObserver observer) + ImageObserver observer) { if (addObserver(observer)) return false; @@ -495,14 +495,14 @@ public class QtImage extends Image * compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; if(bgcolor != null) - drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, true); + drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, true); else drawPixels(g, 0, 0, 0, x, y, false); @@ -510,18 +510,18 @@ public class QtImage extends Image } /** - * Draws an image to the QtGraphics context, at (x,y) scaled to + * Draws an image to the QtGraphics context, at (x,y) scaled to * width and height, with optional compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; if(bgcolor != null) - drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, width, height, true); + drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, width, height, true); else drawPixelsScaled(g, 0, 0, 0, x, y, width, height, false); @@ -531,9 +531,9 @@ public class QtImage extends Image /** * Draws an image with eventual scaling/transforming. */ - public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; @@ -549,53 +549,53 @@ public class QtImage extends Image int dstX = (dx1 < dx2) ? dx1 : dx2; int dstY = (dy1 < dy2) ? dy1 : dy2; - // Clipping. This requires the dst to be scaled as well, + // Clipping. This requires the dst to be scaled as well, if (srcWidth > width) { - dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); + srcWidth = width - srcX; } - if (srcHeight > height) + if (srcHeight > height) { - dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); + srcHeight = height - srcY; } if (srcWidth + srcX > width) { - dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); + srcWidth = width - srcX; } if (srcHeight + srcY > height) { - dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); + srcHeight = height - srcY; } if ( srcWidth <= 0 || srcHeight <= 0 || dstWidth <= 0 || dstHeight <= 0) return true; if(bgcolor != null) - drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), - flipX, flipY, - srcX, srcY, - srcWidth, srcHeight, - dstX, dstY, - dstWidth, dstHeight, - true); + drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), + flipX, flipY, + srcX, srcY, + srcWidth, srcHeight, + dstX, dstY, + dstWidth, dstHeight, + true); else drawPixelsScaledFlipped (g, 0, 0, 0, flipX, flipY, - srcX, srcY, srcWidth, srcHeight, - dstX, dstY, dstWidth, dstHeight, - false); + srcX, srcY, srcWidth, srcHeight, + dstX, dstY, dstWidth, dstHeight, + false); return true; } - public native void copyArea(int x, int y, int width, int height, - int dx, int dy); + public native void copyArea(int x, int y, int width, int height, + int dx, int dy); // Private methods //////////////////////////////////////////////// @@ -604,19 +604,19 @@ public class QtImage extends Image */ private void deliver() { - int flags = ImageObserver.HEIGHT | + int flags = ImageObserver.HEIGHT | ImageObserver.WIDTH | ImageObserver.PROPERTIES | ImageObserver.ALLBITS; if (observers != null) for(int i=0; i < observers.size(); i++) - ((ImageObserver)observers.elementAt(i)). - imageUpdate(this, flags, 0, 0, width, height); + ((ImageObserver)observers.elementAt(i)). + imageUpdate(this, flags, 0, 0, width, height); observers = null; } - + /** * Adds an observer, if we need to. * @return true if an observer was added. @@ -625,10 +625,10 @@ public class QtImage extends Image { if (!isLoaded) { - if(observer != null) - if (!observers.contains (observer)) - observers.addElement (observer); - return true; + if(observer != null) + if (!observers.contains (observer)) + observers.addElement (observer); + return true; } return false; } diff --git a/gnu/java/awt/peer/qt/QtImageConsumer.java b/gnu/java/awt/peer/qt/QtImageConsumer.java index 7096c21e4..9883475f9 100644 --- a/gnu/java/awt/peer/qt/QtImageConsumer.java +++ b/gnu/java/awt/peer/qt/QtImageConsumer.java @@ -86,44 +86,44 @@ public class QtImageConsumer implements ImageConsumer public synchronized void setHints (int flags) { // This method informs us in which order the pixels are - // delivered, for progressive-loading support, etc. + // delivered, for progressive-loading support, etc. // Since we wait until it's all loaded, we can ignore the hints. } - public synchronized void setPixels (int x, int y, int width, int height, - ColorModel cm, byte[] pixels, - int offset, int scansize) + public synchronized void setPixels (int x, int y, int width, int height, + ColorModel cm, byte[] pixels, + int offset, int scansize) { setPixels (x, y, width, height, cm, convertPixels (pixels), offset, scansize); } - public synchronized void setPixels (int x, int y, int width, int height, - ColorModel cm, int[] pixels, - int offset, int scansize) + public synchronized void setPixels (int x, int y, int width, int height, + ColorModel cm, int[] pixels, + int offset, int scansize) { if (pixelCache == null) return; // Not sure this should ever happen. if (cm.equals(QtImage.nativeModel)) for (int i = 0; i < height; i++) - System.arraycopy (pixels, offset + (i * scansize), - pixelCache, (y + i) * this.width + x, - width); + System.arraycopy (pixels, offset + (i * scansize), + pixelCache, (y + i) * this.width + x, + width); else { - for (int i = 0; i < height; i++) - for (int j = 0; j < width; j++) - { - // get in AARRGGBB and convert to AABBGGRR - int pix = cm.getRGB(pixels[offset + (i * scansize) + x + j]); - byte b = (byte)(pix & 0xFF); - byte r = (byte)(((pix & 0x00FF0000) >> 16) & 0xFF); - pix &= 0xFF00FF00; - pix |= ((b & 0xFF) << 16); - pix |= (r & 0xFF); - pixelCache[(y + i) * this.width + x + j] = pix; - } + for (int i = 0; i < height; i++) + for (int j = 0; j < width; j++) + { + // get in AARRGGBB and convert to AABBGGRR + int pix = cm.getRGB(pixels[offset + (i * scansize) + x + j]); + byte b = (byte)(pix & 0xFF); + byte r = (byte)(((pix & 0x00FF0000) >> 16) & 0xFF); + pix &= 0xFF00FF00; + pix |= ((b & 0xFF) << 16); + pix |= (r & 0xFF); + pixelCache[(y + i) * this.width + x + j] = pix; + } } } @@ -136,7 +136,7 @@ public class QtImageConsumer implements ImageConsumer for (int i = 0; i < pixels.length; i++) ret[i] = pixels[i] & 0xFF; - + return ret; } @@ -145,5 +145,3 @@ public class QtImageConsumer implements ImageConsumer this.properties = props; } } - - diff --git a/gnu/java/awt/peer/qt/QtImageDirectGraphics.java b/gnu/java/awt/peer/qt/QtImageDirectGraphics.java index d49084af8..daa174ad4 100644 --- a/gnu/java/awt/peer/qt/QtImageDirectGraphics.java +++ b/gnu/java/awt/peer/qt/QtImageDirectGraphics.java @@ -75,7 +75,7 @@ public class QtImageDirectGraphics extends QtImageGraphics } public void draw(Shape s) - { + { super.draw(s); scheduleUpdate(); } @@ -105,43 +105,41 @@ public class QtImageDirectGraphics extends QtImageGraphics } public boolean drawImage(Image image, - AffineTransform Tx, - ImageObserver obs) + AffineTransform Tx, + ImageObserver obs) { boolean r = super.drawImage(image, Tx, obs); scheduleUpdate(); return r; } - public boolean drawImage(Image image, int x, int y, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, Color bgcolor, + ImageObserver observer) { boolean r = super.drawImage(image, x, y, bgcolor, observer); scheduleUpdate(); return r; } - public boolean drawImage(Image image, - int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage(Image image, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { - boolean r = super.drawImage( image, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, - bgcolor, observer); + boolean r = super.drawImage( image, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, + bgcolor, observer); scheduleUpdate(); return r; } - public boolean drawImage(Image image, int x, int y, - int width, int height, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, + int width, int height, Color bgcolor, + ImageObserver observer) { - boolean r = super.drawImage(image, x, y, width, height, bgcolor, - observer); + boolean r = super.drawImage(image, x, y, width, height, bgcolor, + observer); scheduleUpdate(); return r; } -} - - +} diff --git a/gnu/java/awt/peer/qt/QtImageGraphics.java b/gnu/java/awt/peer/qt/QtImageGraphics.java index 1224d6915..bba25e068 100644 --- a/gnu/java/awt/peer/qt/QtImageGraphics.java +++ b/gnu/java/awt/peer/qt/QtImageGraphics.java @@ -65,17 +65,17 @@ public class QtImageGraphics extends QtGraphics int w, h; if(image instanceof QtImage) { - w = ((QtImage)image).width; - h = ((QtImage)image).height; - initImage((QtImage) image ); - ((QtImage)image).putPainter( this ); - } + w = ((QtImage)image).width; + h = ((QtImage)image).height; + initImage((QtImage) image ); + ((QtImage)image).putPainter( this ); + } else { - w = ((QtVolatileImage)image).width; - h = ((QtVolatileImage)image).height; - initVolatileImage((QtVolatileImage) image ); - ((QtVolatileImage)image).putPainter( this ); + w = ((QtVolatileImage)image).width; + h = ((QtVolatileImage)image).height; + initVolatileImage((QtVolatileImage) image ); + ((QtVolatileImage)image).putPainter( this ); } parentImage = image; @@ -92,7 +92,7 @@ public class QtImageGraphics extends QtGraphics */ QtImageGraphics( QtImageGraphics g ) { - super( g ); + super( g ); parentImage = g.parentImage; if(parentImage instanceof QtImage) ((QtImage)parentImage).putPainter( this ); @@ -119,9 +119,9 @@ public class QtImageGraphics extends QtGraphics /** * Copy an area. - */ - public void copyArea(int x, int y, int width, int height, - int dx, int dy) + */ + public void copyArea(int x, int y, int width, int height, + int dx, int dy) { if(parentImage instanceof QtImage) ((QtImage)parentImage).copyArea(x, y, width, height, dx, dy); @@ -136,6 +136,4 @@ public class QtImageGraphics extends QtGraphics { throw new UnsupportedOperationException("Not implemented yet"); } -} - - +} diff --git a/gnu/java/awt/peer/qt/QtLabelPeer.java b/gnu/java/awt/peer/qt/QtLabelPeer.java index 449c9b3cb..80acd491d 100644 --- a/gnu/java/awt/peer/qt/QtLabelPeer.java +++ b/gnu/java/awt/peer/qt/QtLabelPeer.java @@ -46,9 +46,9 @@ public class QtLabelPeer extends QtComponentPeer implements LabelPeer { super( kit, owner ); } - + protected native void init(); - + protected void setup() { super.setup(); diff --git a/gnu/java/awt/peer/qt/QtListPeer.java b/gnu/java/awt/peer/qt/QtListPeer.java index 9df250a42..14ae2a0cd 100644 --- a/gnu/java/awt/peer/qt/QtListPeer.java +++ b/gnu/java/awt/peer/qt/QtListPeer.java @@ -84,26 +84,26 @@ public class QtListPeer extends QtComponentPeer implements ListPeer if( index == -1) ((List)owner).deselect( ((List)owner).getSelectedIndex() ); else - { - ((List)owner).select( index ); - ItemEvent e = new ItemEvent((List)owner, - ItemEvent.ITEM_STATE_CHANGED, - ""+index, - ItemEvent.SELECTED); - QtToolkit.eventQueue.postEvent(e); - } + { + ((List)owner).select( index ); + ItemEvent e = new ItemEvent((List)owner, + ItemEvent.ITEM_STATE_CHANGED, + ""+index, + ItemEvent.SELECTED); + QtToolkit.eventQueue.postEvent(e); + } } /** * Called back when an item is double-clicked. - */ + */ private void itemDoubleClicked( int index, int modifiers ) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((List)owner).getItem( index ), - System.currentTimeMillis(), - modifiers); + ActionEvent.ACTION_PERFORMED, + ((List)owner).getItem( index ), + System.currentTimeMillis(), + modifiers); QtToolkit.eventQueue.postEvent(e); } @@ -129,10 +129,10 @@ public class QtListPeer extends QtComponentPeer implements ListPeer public native void delItems(int start_index, int end_index); public void deselect(int index) - { + { if( ignoreNextSelect == true ) ignoreNextSelect = false; - else + else select(index, false); } @@ -159,7 +159,7 @@ public class QtListPeer extends QtComponentPeer implements ListPeer { if( ignoreNextSelect == true ) ignoreNextSelect = false; - else + else select(index, true); } diff --git a/gnu/java/awt/peer/qt/QtMenuBarPeer.java b/gnu/java/awt/peer/qt/QtMenuBarPeer.java index c91b37f37..962d76d41 100644 --- a/gnu/java/awt/peer/qt/QtMenuBarPeer.java +++ b/gnu/java/awt/peer/qt/QtMenuBarPeer.java @@ -47,15 +47,15 @@ public class QtMenuBarPeer extends QtMenuComponentPeer implements MenuBarPeer { super( kit, owner ); } - + protected native void init(); - + protected void setup() { } - /** - * Recurses the menubar adding menus (and menu items), + /** + * Recurses the menubar adding menus (and menu items), * called from the Frame peer. */ void addMenus() @@ -99,4 +99,3 @@ public class QtMenuBarPeer extends QtMenuComponentPeer implements MenuBarPeer delMenu( (QtMenuPeer)m.getPeer() ); } } - diff --git a/gnu/java/awt/peer/qt/QtMenuComponentPeer.java b/gnu/java/awt/peer/qt/QtMenuComponentPeer.java index 7e292d00f..2050bef06 100644 --- a/gnu/java/awt/peer/qt/QtMenuComponentPeer.java +++ b/gnu/java/awt/peer/qt/QtMenuComponentPeer.java @@ -41,27 +41,27 @@ import java.awt.Font; import java.awt.MenuComponent; import java.awt.peer.MenuComponentPeer; -public class QtMenuComponentPeer extends NativeWrapper +public class QtMenuComponentPeer extends NativeWrapper implements MenuComponentPeer { protected QtToolkit toolkit; protected MenuComponent owner; - + public QtMenuComponentPeer( QtToolkit kit, MenuComponent owner ) { this.toolkit = kit; this.owner = owner; nativeObject = 0; - synchronized(this) + synchronized(this) { - callInit(); // Calls the init method FROM THE MAIN THREAD. - try - { - wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + callInit(); // Calls the init method FROM THE MAIN THREAD. + try + { + wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } setup(); } @@ -80,7 +80,7 @@ public class QtMenuComponentPeer extends NativeWrapper { dispose(); } - + // ************ Public methods ********************* public native void dispose(); @@ -88,7 +88,7 @@ public class QtMenuComponentPeer extends NativeWrapper public void setFont(Font font) { // TODO Auto-generated method stub - + } } diff --git a/gnu/java/awt/peer/qt/QtMenuItemPeer.java b/gnu/java/awt/peer/qt/QtMenuItemPeer.java index 7658ff078..2b77540a5 100644 --- a/gnu/java/awt/peer/qt/QtMenuItemPeer.java +++ b/gnu/java/awt/peer/qt/QtMenuItemPeer.java @@ -43,7 +43,7 @@ import java.awt.event.ActionEvent; import java.awt.peer.MenuItemPeer; import java.awt.peer.CheckboxMenuItemPeer; -public class QtMenuItemPeer extends QtMenuComponentPeer +public class QtMenuItemPeer extends QtMenuComponentPeer implements MenuItemPeer, CheckboxMenuItemPeer { public QtMenuItemPeer( QtToolkit toolkit, MenuItem owner ) @@ -73,15 +73,15 @@ public class QtMenuItemPeer extends QtMenuComponentPeer private void fireClick(int modifiers) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((MenuItem)owner).getActionCommand(), - System.currentTimeMillis(), - (modifiers & 0x2FF)); + ActionEvent.ACTION_PERFORMED, + ((MenuItem)owner).getActionCommand(), + System.currentTimeMillis(), + (modifiers & 0x2FF)); QtToolkit.eventQueue.postEvent(e); } // ************ Public methods ********************* - + public void disable() { setEnabled(false); @@ -98,10 +98,3 @@ public class QtMenuItemPeer extends QtMenuComponentPeer public native void setState(boolean state); } - - - - - - - diff --git a/gnu/java/awt/peer/qt/QtMenuPeer.java b/gnu/java/awt/peer/qt/QtMenuPeer.java index 87324c710..0f65fecbd 100644 --- a/gnu/java/awt/peer/qt/QtMenuPeer.java +++ b/gnu/java/awt/peer/qt/QtMenuPeer.java @@ -56,7 +56,7 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer } protected native void init(); - + protected void setup() { items = new Vector(); @@ -65,29 +65,29 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer allowTearOff(); } - // Recurse the menu tree adding items, + // Recurse the menu tree adding items, // called from the MenuBar addMenus() method, called from the Frame peer. void addItems() { if(!itemsAdded) { - Menu o = (Menu)owner; - for( int i=0; i < o.getItemCount(); i++ ) - { - MenuItem ci = o.getItem(i); - if (ci instanceof Menu && ci.getPeer() != null) - ((QtMenuPeer)ci.getPeer()).addItems(); - addItem( ci ); - } - itemsAdded = true; + Menu o = (Menu)owner; + for( int i=0; i < o.getItemCount(); i++ ) + { + MenuItem ci = o.getItem(i); + if (ci instanceof Menu && ci.getPeer() != null) + ((QtMenuPeer)ci.getPeer()).addItems(); + addItem( ci ); + } + itemsAdded = true; } } private void fireClick() { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((Menu)owner).getActionCommand()); + ActionEvent.ACTION_PERFORMED, + ((Menu)owner).getActionCommand()); QtToolkit.eventQueue.postEvent(e); } @@ -112,13 +112,13 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer { if( item instanceof Menu || item instanceof PopupMenu) insertMenu((QtMenuPeer)item.getPeer()); - else + else { - QtMenuItemPeer p = (QtMenuItemPeer)item.getPeer(); - insertItem(p); + QtMenuItemPeer p = (QtMenuItemPeer)item.getPeer(); + insertItem(p); } } - + public void addSeparator() { insertSeperator(); @@ -147,6 +147,3 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer public native void setLabel(String text); } - - - diff --git a/gnu/java/awt/peer/qt/QtPanelPeer.java b/gnu/java/awt/peer/qt/QtPanelPeer.java index 9e4352331..1ac0ca9a6 100644 --- a/gnu/java/awt/peer/qt/QtPanelPeer.java +++ b/gnu/java/awt/peer/qt/QtPanelPeer.java @@ -46,7 +46,7 @@ public class QtPanelPeer extends QtContainerPeer implements PanelPeer { super( kit, owner ); } - + protected native void init(); protected void setup() diff --git a/gnu/java/awt/peer/qt/QtPopupMenuPeer.java b/gnu/java/awt/peer/qt/QtPopupMenuPeer.java index b96c5c510..eb4dae404 100644 --- a/gnu/java/awt/peer/qt/QtPopupMenuPeer.java +++ b/gnu/java/awt/peer/qt/QtPopupMenuPeer.java @@ -74,6 +74,3 @@ public class QtPopupMenuPeer extends QtMenuPeer implements PopupMenuPeer show((Component)e.target, e.x, e.y); } } - - - diff --git a/gnu/java/awt/peer/qt/QtRepaintThread.java b/gnu/java/awt/peer/qt/QtRepaintThread.java index 405505e9b..6861be8fc 100644 --- a/gnu/java/awt/peer/qt/QtRepaintThread.java +++ b/gnu/java/awt/peer/qt/QtRepaintThread.java @@ -42,13 +42,13 @@ package gnu.java.awt.peer.qt; * do this directly from the paint callback in QtComponentPeer, because that * is executed from the main thread. Thus, if a call is made at the same time * which requires execution by the main thread, and this is sharing a lock with - * paint(), then a deadlock will occur, which must be avoided. In general, + * paint(), then a deadlock will occur, which must be avoided. In general, * the main Qt thread should avoid calling into java code as far as possible. * */ -public class QtRepaintThread extends Thread +public class QtRepaintThread extends Thread { - static class RepaintComponent + static class RepaintComponent { public QtComponentPeer curr; public RepaintComponent next; @@ -72,7 +72,7 @@ public class QtRepaintThread extends Thread this.h = h; } } - + RepaintComponent component; boolean busy; @@ -85,39 +85,39 @@ public class QtRepaintThread extends Thread { while( true ) { - try - { - busy = false; - // Wait for a repaint - sleep(100); - busy = true; - } - catch (InterruptedException ie) - { - while( component != null ) - { - try - { - if( component.paintAll ) - { - // update the back-buffer. - component.curr.paintBackBuffer(); - component.curr.QtUpdate(); // trigger a native repaint event - } - else - { - component.curr.paintBackBuffer(component.x, component.y, - component.w, component.h); - component.curr.QtUpdateArea(component.x, component.y, - component.w, component.h); - } - } - catch (InterruptedException e) - { - } - component = component.next; - } - } + try + { + busy = false; + // Wait for a repaint + sleep(100); + busy = true; + } + catch (InterruptedException ie) + { + while( component != null ) + { + try + { + if( component.paintAll ) + { + // update the back-buffer. + component.curr.paintBackBuffer(); + component.curr.QtUpdate(); // trigger a native repaint event + } + else + { + component.curr.paintBackBuffer(component.x, component.y, + component.w, component.h); + component.curr.QtUpdateArea(component.x, component.y, + component.w, component.h); + } + } + catch (InterruptedException e) + { + } + component = component.next; + } + } } } @@ -130,9 +130,9 @@ public class QtRepaintThread extends Thread component = new RepaintComponent(p); else { - RepaintComponent r = component; - while( r.next != null ) r = r.next; - r.next = new RepaintComponent(p); + RepaintComponent r = component; + while( r.next != null ) r = r.next; + r.next = new RepaintComponent(p); } interrupt(); } @@ -140,16 +140,16 @@ public class QtRepaintThread extends Thread /** * Enqueue a component for repainting. */ - public synchronized void queueComponent(QtComponentPeer p, int x, int y, - int w, int h) + public synchronized void queueComponent(QtComponentPeer p, int x, int y, + int w, int h) { if( component == null ) component = new RepaintComponent(p, x, y, w, h); else { - RepaintComponent r = component; - while( r.next != null ) r = r.next; - r.next = new RepaintComponent(p, x, y, w, h); + RepaintComponent r = component; + while( r.next != null ) r = r.next; + r.next = new RepaintComponent(p, x, y, w, h); } interrupt(); } diff --git a/gnu/java/awt/peer/qt/QtScreenDevice.java b/gnu/java/awt/peer/qt/QtScreenDevice.java index c2d73aed1..c7d8a4784 100644 --- a/gnu/java/awt/peer/qt/QtScreenDevice.java +++ b/gnu/java/awt/peer/qt/QtScreenDevice.java @@ -113,4 +113,3 @@ public class QtScreenDevice extends GraphicsDevice { } } - diff --git a/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java b/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java index c67b55bf4..34de36c09 100644 --- a/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java +++ b/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java @@ -47,7 +47,7 @@ import java.awt.image.VolatileImage; import java.awt.geom.AffineTransform; public class QtScreenDeviceConfiguration extends GraphicsConfiguration { - + private QtScreenDevice owner; private Rectangle bounds; private double dpiX, dpiY; @@ -67,21 +67,21 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { switch( depth ) { case 24: - return new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR); + return new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR); case 16: - return new BufferedImage(width, height, - BufferedImage.TYPE_USHORT_565_RGB); + return new BufferedImage(width, height, + BufferedImage.TYPE_USHORT_565_RGB); case 8: - return new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED); + return new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED); default: case 32: - return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); } } public BufferedImage createCompatibleImage(int width, int height, int transparency) { - // FIXME: Take the transpareny flag into account? + // FIXME: Take the transpareny flag into account? // For now, ignore it and just use an alpha channel. if(depth == 32) return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); @@ -92,9 +92,9 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { { return new QtVolatileImage( width, height ); } - - public VolatileImage createCompatibleVolatileImage(int width, int height, - ImageCapabilities caps) + + public VolatileImage createCompatibleVolatileImage(int width, int height, + ImageCapabilities caps) { return createCompatibleVolatileImage( width, height ); } @@ -121,7 +121,7 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { return new AffineTransform(); } - public GraphicsDevice getDevice() + public GraphicsDevice getDevice() { return owner; } @@ -137,8 +137,8 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { return nTrans; } - public VolatileImage createCompatibleVolatileImage(int width, int height, - int transparency) + public VolatileImage createCompatibleVolatileImage(int width, int height, + int transparency) { return createCompatibleVolatileImage(width, height); } diff --git a/gnu/java/awt/peer/qt/QtScrollPanePeer.java b/gnu/java/awt/peer/qt/QtScrollPanePeer.java index c3731cbd5..079d06de7 100644 --- a/gnu/java/awt/peer/qt/QtScrollPanePeer.java +++ b/gnu/java/awt/peer/qt/QtScrollPanePeer.java @@ -48,7 +48,7 @@ public class QtScrollPanePeer extends QtContainerPeer implements ScrollPanePeer { super( kit, owner ); } - + protected native void init(); protected void setup() @@ -73,9 +73,9 @@ public class QtScrollPanePeer extends QtContainerPeer implements ScrollPanePeer { // FIXME : more accurate? return new Insets(5 + getHScrollbarHeight(), // Top - 5 + getVScrollbarWidth(), // Left - 5, // Bottom - 5); // Right + 5 + getVScrollbarWidth(), // Left + 5, // Bottom + 5); // Right } public void setUnitIncrement(Adjustable item, int inc) diff --git a/gnu/java/awt/peer/qt/QtScrollbarPeer.java b/gnu/java/awt/peer/qt/QtScrollbarPeer.java index 838cca62d..694287131 100644 --- a/gnu/java/awt/peer/qt/QtScrollbarPeer.java +++ b/gnu/java/awt/peer/qt/QtScrollbarPeer.java @@ -65,13 +65,13 @@ public class QtScrollbarPeer extends QtComponentPeer implements ScrollbarPeer private void fireMoved(int type, int value) { AdjustmentEvent e = new AdjustmentEvent((Scrollbar)owner, - AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED, - type, value); + AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED, + type, value); QtToolkit.eventQueue.postEvent(e); } - + // ************ Public methods ********************* - + public native void setLineIncrement(int inc); public native void setPageIncrement(int inc); diff --git a/gnu/java/awt/peer/qt/QtTextAreaPeer.java b/gnu/java/awt/peer/qt/QtTextAreaPeer.java index f37b9537c..a5aff58ef 100644 --- a/gnu/java/awt/peer/qt/QtTextAreaPeer.java +++ b/gnu/java/awt/peer/qt/QtTextAreaPeer.java @@ -69,7 +69,7 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer * Called back on a text edit. */ private void textChanged() - { + { TextEvent e = new TextEvent(owner, TextEvent.TEXT_VALUE_CHANGED); QtToolkit.eventQueue.postEvent(e); } @@ -95,7 +95,7 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer public native int getIndexAtPoint(int x, int y); // public void reshape(int x, int y, -// int width, int height) +// int width, int height) // { // if(width != 0 || height != 0) // super.reshape(x, y, width, height); @@ -177,4 +177,3 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer return null; } } - diff --git a/gnu/java/awt/peer/qt/QtTextFieldPeer.java b/gnu/java/awt/peer/qt/QtTextFieldPeer.java index 0e3d5af78..f92943202 100644 --- a/gnu/java/awt/peer/qt/QtTextFieldPeer.java +++ b/gnu/java/awt/peer/qt/QtTextFieldPeer.java @@ -80,7 +80,7 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer // ************ Public methods ********************* - public long filterEvents(long e) + public long filterEvents(long e) { return e; } @@ -91,7 +91,7 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer { return new Rectangle(0,0,0,0); } - + public int getIndexAtPoint(int x, int y) { // FIXME @@ -157,4 +157,3 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer return null; } } - diff --git a/gnu/java/awt/peer/qt/QtToolkit.java b/gnu/java/awt/peer/qt/QtToolkit.java index 4cea976ac..9f8a691c6 100644 --- a/gnu/java/awt/peer/qt/QtToolkit.java +++ b/gnu/java/awt/peer/qt/QtToolkit.java @@ -111,7 +111,7 @@ import java.util.Properties; public class QtToolkit extends ClasspathToolkit { public static EventQueue eventQueue = null; // the native event queue - public static QtRepaintThread repaintThread = null; + public static QtRepaintThread repaintThread = null; public static MainQtThread guiThread = null; public static QtGraphicsEnvironment graphicsEnv = null; @@ -122,12 +122,12 @@ public class QtToolkit extends ClasspathToolkit System.loadLibrary("qtpeer"); String theme = null; - try + try { - String style = System.getProperty("qtoptions.style"); - if(style != null) - theme = style; - } + String style = System.getProperty("qtoptions.style"); + if(style != null) + theme = style; + } catch(SecurityException e) { } @@ -136,12 +136,12 @@ public class QtToolkit extends ClasspathToolkit } boolean doublebuffer = true; - try + try { - String style = System.getProperty("qtoptions.nodoublebuffer"); - if(style != null) - doublebuffer = false; - } + String style = System.getProperty("qtoptions.nodoublebuffer"); + if(style != null) + doublebuffer = false; + } catch(SecurityException e) { } @@ -171,7 +171,7 @@ public class QtToolkit extends ClasspathToolkit } native String[] nativeFontFamilies(); - + native int numScreens(); native int defaultScreen(); @@ -213,7 +213,7 @@ public class QtToolkit extends ClasspathToolkit return new QtMenuItemPeer( this, target ); } - public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge) + public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge) { throw new RuntimeException("Not implemented"); } @@ -232,16 +232,16 @@ public class QtToolkit extends ClasspathToolkit { return new QtImage( producer ); } - + public Image createImage(byte[] imageData, - int imageOffset, - int imageLength) + int imageOffset, + int imageLength) { byte[] dataCopy = new byte[imageLength]; System.arraycopy(imageData, imageOffset, dataCopy, 0, imageLength); return new QtImage( dataCopy ); } - + public Image createImage(String filename) { return new QtImage( filename ); @@ -256,7 +256,7 @@ public class QtToolkit extends ClasspathToolkit { return new QtTextFieldPeer(this,target); } - + protected LabelPeer createLabel(Label target) { return new QtLabelPeer( this, target ); @@ -335,11 +335,11 @@ public class QtToolkit extends ClasspathToolkit public ColorModel getColorModel() { - return new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + return new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); } /** @@ -347,11 +347,11 @@ public class QtToolkit extends ClasspathToolkit */ public String[] getFontList() { - String[] builtIn = new String[] { "Dialog", - "DialogInput", - "Monospaced", - "Serif", - "SansSerif" }; + String[] builtIn = new String[] { "Dialog", + "DialogInput", + "Monospaced", + "Serif", + "SansSerif" }; String[] nat = nativeFontFamilies(); String[] allFonts = new String[ nat.length + 5 ]; System.arraycopy(builtIn, 0, allFonts, 0, 5); @@ -365,7 +365,7 @@ public class QtToolkit extends ClasspathToolkit } protected FontPeer getFontPeer(String name, - int style) + int style) { Map attrs = new HashMap (); ClasspathFontPeer.copyStyleToAttrs(style, attrs); @@ -384,14 +384,14 @@ public class QtToolkit extends ClasspathToolkit } public PrintJob getPrintJob(Frame frame, - String jobtitle, - Properties props) + String jobtitle, + Properties props) { SecurityManager sm; sm = System.getSecurityManager(); if (sm != null) sm.checkPrintJobAccess(); - + throw new RuntimeException("Not implemented"); } @@ -412,8 +412,8 @@ public class QtToolkit extends ClasspathToolkit public Map mapInputMethodHighlight(InputMethodHighlight highlight) { return null; // FIXME - } - + } + public boolean prepareImage(Image image, int w, int h, ImageObserver observer) { if(image instanceof QtImage) @@ -431,7 +431,7 @@ public class QtToolkit extends ClasspathToolkit } public ClasspathFontPeer getClasspathFontPeer (String name, Map attrs) - { + { return new QtFontPeer (name, attrs); } diff --git a/gnu/java/awt/peer/qt/QtVolatileImage.java b/gnu/java/awt/peer/qt/QtVolatileImage.java index c81bb2a09..a203de0d0 100644 --- a/gnu/java/awt/peer/qt/QtVolatileImage.java +++ b/gnu/java/awt/peer/qt/QtVolatileImage.java @@ -74,11 +74,11 @@ public class QtVolatileImage extends VolatileImage /* * The 32-bit AARRGGBB format the uses. */ - static ColorModel nativeModel = new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + static ColorModel nativeModel = new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); /** * Clears the image to RGBA 0 @@ -111,7 +111,7 @@ public class QtVolatileImage extends VolatileImage private native void freeImage(); /** - * Blit a QImage + * Blit a QImage */ public native void blit(QtImage i); public native void blit(QtImage i, int x, int y, int w, int h); @@ -124,35 +124,35 @@ public class QtVolatileImage extends VolatileImage /** * Draws the image optionally composited. */ - private native void drawPixels (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, - boolean composite); + private native void drawPixels (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, + boolean composite); /** * Draws the image, optionally scaled and composited. */ - private native void drawPixelsScaled (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, int width, int height, - boolean composite); + private native void drawPixelsScaled (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, int width, int height, + boolean composite); /** * Draws the image transformed. */ private native void drawPixelsTransformed (QtGraphics gc, QMatrix transform); - + /** * Draws the image scaled flipped and optionally composited. */ - native void drawPixelsScaledFlipped (QtGraphics gc, - int bg_red, int bg_green, - int bg_blue, - boolean flipX, boolean flipY, - int srcX, int srcY, - int srcWidth, int srcHeight, - int dstX, int dstY, - int dstWidth, int dstHeight, - boolean composite); + native void drawPixelsScaledFlipped (QtGraphics gc, + int bg_red, int bg_green, + int bg_blue, + boolean flipX, boolean flipY, + int srcX, int srcY, + int srcWidth, int srcHeight, + int dstX, int dstY, + int dstWidth, int dstHeight, + boolean composite); /** * Constructs an empty QtVolatileImage. @@ -169,8 +169,8 @@ public class QtVolatileImage extends VolatileImage /** * Constructs a scaled version of the src bitmap, using Qt */ - private QtVolatileImage (QtVolatileImage src, int width, int height, - int hints) + private QtVolatileImage (QtVolatileImage src, int width, int height, + int hints) { this.width = width; this.height = height; @@ -190,7 +190,7 @@ public class QtVolatileImage extends VolatileImage if( painters == null || painters.isEmpty() ) freeImage(); else - killFlag = true; // can't destroy image yet. + killFlag = true; // can't destroy image yet. // Do so when all painters are gone. } @@ -200,7 +200,7 @@ public class QtVolatileImage extends VolatileImage { return getWidth(); } - + public int getHeight (ImageObserver observer) { return getHeight(); @@ -217,8 +217,8 @@ public class QtVolatileImage extends VolatileImage */ public ImageProducer getSource () { - return new MemoryImageSource(width, height, nativeModel, getPixels(), - 0, width); + return new MemoryImageSource(width, height, nativeModel, getPixels(), + 0, width); } void putPainter(QtImageGraphics g) @@ -244,17 +244,17 @@ public class QtVolatileImage extends VolatileImage putPainter( g ); return g; } - + /** * Returns a scaled instance of this image. */ public Image getScaledInstance(int width, - int height, - int hints) + int height, + int hints) { if (width <= 0 || height <= 0) throw new IllegalArgumentException("Width and height of scaled bitmap"+ - "must be >= 0"); + "must be >= 0"); return new QtVolatileImage(this, width, height, hints); } @@ -280,7 +280,7 @@ public class QtVolatileImage extends VolatileImage * Draws an image with eventual scaling/transforming. */ public boolean drawImage (QtGraphics g, QMatrix matrix, - ImageObserver observer) + ImageObserver observer) { drawPixelsTransformed (g, matrix); return true; @@ -291,11 +291,11 @@ public class QtVolatileImage extends VolatileImage * compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if(bgcolor != null) - drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, true); + drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, true); else drawPixels(g, 0, 0, 0, x, y, false); @@ -303,27 +303,27 @@ public class QtVolatileImage extends VolatileImage } /** - * Draws an image to the QtGraphics context, at (x,y) scaled to + * Draws an image to the QtGraphics context, at (x,y) scaled to * width and height, with optional compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if(bgcolor != null) - drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, width, height, true); + drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, width, height, true); else drawPixelsScaled(g, 0, 0, 0, x, y, width, height, false); - + return true; } /** * Draws an image with eventual scaling/transforming. */ - public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { boolean flipX = (dx1 > dx2)^(sx1 > sx2); boolean flipY = (dy1 > dy2)^(sy1 > sy2); @@ -336,53 +336,53 @@ public class QtVolatileImage extends VolatileImage int dstX = (dx1 < dx2) ? dx1 : dx2; int dstY = (dy1 < dy2) ? dy1 : dy2; - // Clipping. This requires the dst to be scaled as well, + // Clipping. This requires the dst to be scaled as well, if (srcWidth > width) { - dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); + srcWidth = width - srcX; } - if (srcHeight > height) + if (srcHeight > height) { - dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); + srcHeight = height - srcY; } if (srcWidth + srcX > width) { - dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); + srcWidth = width - srcX; } if (srcHeight + srcY > height) { - dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); + srcHeight = height - srcY; } if ( srcWidth <= 0 || srcHeight <= 0 || dstWidth <= 0 || dstHeight <= 0) return true; if(bgcolor != null) - drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), - flipX, flipY, - srcX, srcY, - srcWidth, srcHeight, - dstX, dstY, - dstWidth, dstHeight, - true); + drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), + flipX, flipY, + srcX, srcY, + srcWidth, srcHeight, + dstX, dstY, + dstWidth, dstHeight, + true); else drawPixelsScaledFlipped (g, 0, 0, 0, flipX, flipY, - srcX, srcY, srcWidth, srcHeight, - dstX, dstY, dstWidth, dstHeight, - false); + srcX, srcY, srcWidth, srcHeight, + dstX, dstY, dstWidth, dstHeight, + false); return true; } - - public native void copyArea(int x, int y, int width, int height, - int dx, int dy); + + public native void copyArea(int x, int y, int width, int height, + int dx, int dy); //******************** VolatileImage stuff ******************** @@ -402,10 +402,10 @@ public class QtVolatileImage extends VolatileImage { return new ImageCapabilities(false) { - public boolean isTrueVolatile() - { - return false; - } + public boolean isTrueVolatile() + { + return false; + } }; } @@ -416,8 +416,8 @@ public class QtVolatileImage extends VolatileImage public BufferedImage getSnapshot() { - BufferedImage bi = new BufferedImage(width, height, - BufferedImage.TYPE_INT_ARGB_PRE); + BufferedImage bi = new BufferedImage(width, height, + BufferedImage.TYPE_INT_ARGB_PRE); bi.setRGB( 0, 0, width, height, getPixels(), 0, width); return bi; } diff --git a/gnu/java/awt/peer/qt/QtWindowPeer.java b/gnu/java/awt/peer/qt/QtWindowPeer.java index e0a9e8c55..2dfe2ec5a 100644 --- a/gnu/java/awt/peer/qt/QtWindowPeer.java +++ b/gnu/java/awt/peer/qt/QtWindowPeer.java @@ -53,7 +53,7 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer { super.setup(); } - + // ************ Public methods ********************* public native void toBack(); @@ -68,7 +68,7 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer public void updateAlwaysOnTop() { // TODO Auto-generated method stub - + } public boolean requestWindowFocus() |