harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r440748 [1/25] - in /incubator/harmony/enhanced/classlib/trunk/modules: accessibility/src/main/java/javax/accessibility/ awt/ awt/make/ awt/src/main/java/common/java/awt/ awt/src/main/java/common/java/awt/datatransfer/ awt/src/main/java/com...
Date Wed, 06 Sep 2006 16:06:30 GMT
Author: mloenko
Date: Wed Sep  6 09:06:15 2006
New Revision: 440748

URL: http://svn.apache.org/viewvc?view=rev&rev=440748
Log:
HARMONY-1225 integration
Assorted fixes and improvements for AWT and SWING modules

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventQueueCore.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventQueueThread.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProvider.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProxy.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSnapshot.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataTransferThread.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DragSourceEventProxy.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/RawBitmap.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/TextFlavor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontExtraMetrics.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/DataBufferListener.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/GL.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/GLDefs.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/OGLBlitter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/OGLContextManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/OGLGraphics2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/OGLSurface.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/OGLVolatileImage.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/opengl/TextureCache.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/CompositionWindow.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMJFrame.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMWindow.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeEventThread.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeIM.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/ShutdownThread.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/ShutdownWatchdog.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDragSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDragSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WinDataTransfer.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/org_apache_harmony_awt_nativebridge_linux_GLX.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/org_apache_harmony_awt_nativebridge_linux_GLX.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/IndexColorModelRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/wtk/ShutdownThreadTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/org/apache/harmony/awt/wtk/ShutdownWatchdogTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SizeSequence.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DebugGraphicsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/SizeSequenceTest.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEventMulticaster.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dialog.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dispatcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventQueue.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/FileDialog.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/FocusDispatcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/FontMetrics.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Frame.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HWBehavior.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ModalContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Point.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/SystemColor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/TextComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ToolkitImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/MimeTypeProcessor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/SystemFlavorMap.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DnDConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceDragEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTarget.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GlyphMetrics.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/GraphicAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ImageGraphicAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/font/ShapeGraphicAttribute.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferByte.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferDouble.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferFloat.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferInt.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferShort.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBufferUShort.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/ComponentInternals.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextStorage.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Theme.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/NativeClipboard.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/AwtImageBackdoorAccessor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2DFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectAreaOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/TextRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CommonGlyphVector.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CompositeFont.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontMetricsImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontPeerImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontProperty.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/Glyph.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/LineMetricsImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaArcRasterizer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaLineRasterizer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaTextRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/text/InputMethodRequestsImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/text/TextUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/GraphicsFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeEventQueue.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/NativeWindow.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/SystemProperties.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/wtk/WTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxGlyph.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxLineMetrics.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/DrawableTextRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XSurface.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindowFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTheme.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinCursor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinCursorFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWTK.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindow.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/blitter.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/include/org_apache_harmony_awt_gl_ImageSurface.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/include/org_apache_harmony_awt_gl_render_NativeImageBlitter.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_GDIBlitter.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/LinuxNativeFont.c
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/include/org_apache_harmony_awt_gl_font_LinuxNativeFont.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Callback.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/Callback.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_Win32.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_Win32.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/include/org_apache_harmony_awt_gl_font_NativeFont.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/winFont.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/org_apache_harmony_awt_nativebridge_linux_X11.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/org_apache_harmony_awt_nativebridge_linux_X11.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/org_apache_harmony_awt_nativebridge_linux_Xft.cpp
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/org_apache_harmony_awt_nativebridge_linux_Xft.h
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/FileDialogTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/GridBagLayoutRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ListTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/MenuTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/RobotTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/misc/src/main/java/org/apache/harmony/misc/accessors/ObjectAccessor.java
    incubator/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessor.h
    incubator/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/shared/org_apache_harmony_misc_accessors_ObjectAccessorImpl.c
    incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/AbstractButton.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/DebugGraphics.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/DefaultCellEditor.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/DefaultListSelectionModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JColorChooser.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComboBox.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JLayeredPane.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JList.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JPopupMenu.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTabbedPane.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/MenuSelectionManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/RepaintManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SortingFocusTraversalPolicy.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/Spring.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SpringLayout.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/UIDefaults.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/UIManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/border/TitledBorder.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/colorchooser/DefaultColorSelectionModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/colorchooser/HSBPanel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/colorchooser/PreviewPanel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/colorchooser/RGBPanel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/colorchooser/SwatchesPanel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicBorders.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicButtonListener.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicButtonUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicColorChooserUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxKeyboardActions.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboPopup.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicListKeyboardActions.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicListUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicLookAndFeel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPanelUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicProgressBarUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicRootPaneUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicScrollBarUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSpinnerUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSplitPaneDivider.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSplitPaneKeyboardActions.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSplitPaneUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTableKeyboardActions.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTableUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTextFieldUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTextUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicToolBarUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTreeKeyboardActions.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTreeUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/RootPaneFocusHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalBorders.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalButtonUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalInternalFrameUI.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalLookAndFeel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalRootPaneTitlePane.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ChangedCharSetException.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/ComponentView.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/GapContent.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/TabStop.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/DefaultTreeCellRenderer.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/StringConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/Utilities.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundle.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/plaf/resources/metal/MetalResourceBundle.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/AbstractDocument_AbstractElementRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/CompositeViewTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultStyledDocumentRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/FlowViewTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/ParagraphViewTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleContextTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java Wed Sep  6 09:06:15 2006
@@ -25,10 +25,10 @@
 import java.util.Vector;
 
 public class AccessibleRelationSet {
-    protected Vector<AccessibleRelation> relations;
+    protected Vector relations;
 
     public AccessibleRelationSet() {
-        initStorage(0);
+        initStorage();
     }
 
     public AccessibleRelationSet(final AccessibleRelation[] relations) {
@@ -37,7 +37,7 @@
     }
 
     public boolean add(final AccessibleRelation relation) {
-        initStorage(1);
+        initStorage();
         if (contains(relation.key)) {
             return false;
         }
@@ -51,12 +51,6 @@
             add(relations[i]);
         }
     }
-    
-    private void initStorage(final int capacity) {
-        if(relations == null) {
-            relations = new Vector<AccessibleRelation>(capacity);
-        }
-    }
 
     public boolean remove(final AccessibleRelation relation) {
         return relations != null && relations.remove(relation);
@@ -80,8 +74,8 @@
         if (relations == null) {
             return null;
         }
-        for (Iterator<AccessibleRelation> i = relations.iterator(); i.hasNext();) {
-            AccessibleRelation rel = i.next();
+        for (Iterator i = relations.iterator(); i.hasNext();) {
+            AccessibleRelation rel = (AccessibleRelation)i.next();
             if(key.equals(rel.key)) {
                 return rel;
             }
@@ -98,13 +92,26 @@
         if (relations == null) {
             return "";
         }
-        StringBuilder result = new StringBuilder();
-        for (Iterator<AccessibleRelation> it = relations.iterator(); it.hasNext(); ) {
+        StringBuffer result = new StringBuffer();
+        for (Iterator it = relations.iterator(); it.hasNext(); ) {
             result.append(it.next());
             if (it.hasNext()) {
                 result.append(",");
             }
         }
         return result.toString();
+    }
+
+
+    private void initStorage(final int capacity) {
+        if(relations == null) {
+            relations = new Vector(capacity);
+        }
+    }
+
+    private void initStorage() {
+        if(relations == null) {
+            relations = new Vector();
+        }
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleResourceBundle.java Wed Sep  6 09:06:15 2006
@@ -14,15 +14,18 @@
  *  limitations under the License.
  */
 
+/**
+ * @author Dennis Ushakov
+ * @version $Revision$
+ */
+
 package javax.accessibility;
 
 import java.util.ListResourceBundle;
 
-/**
- * @deprecated As of J2SE 1.3, this class is no longer supported.
- */
+
 public class AccessibleResourceBundle extends ListResourceBundle {
-    // Localized values representing the accessible roles and states of the accessible components
+    // Localized values representing the accessible roles and states of the accessible components.
     private final Object[][] contents = {
         {"alert", "alert"},
         {"column_header", "column header"},

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java Wed Sep  6 09:06:15 2006
@@ -25,10 +25,10 @@
 import java.util.Vector;
 
 public class AccessibleStateSet {
-    protected Vector<AccessibleState> states;
+    protected Vector states;
 
     public AccessibleStateSet() {
-        initStorage(0);
+        initStorage();
     }
 
     public AccessibleStateSet(final AccessibleState[] states) {
@@ -37,7 +37,7 @@
     }
 
     public boolean add(final AccessibleState state) {
-        initStorage(1);
+        initStorage();
         if (states.contains(state)) {
             return false;
         }
@@ -51,12 +51,6 @@
             add(states[i]);
         }
     }
-    
-    private void initStorage(final int capacity) {
-        if (states == null) {
-            states = new Vector<AccessibleState>(capacity);
-        }
-    }
 
     public boolean contains(final AccessibleState state) {
         return states == null ? false : states.contains(state);
@@ -78,17 +72,27 @@
     }
 
     public String toString() {
-        if (states == null) {
-            return "";
-        }
-        StringBuilder str = new StringBuilder();
-        for (Iterator<AccessibleState> it = states.iterator(); it.hasNext(); ) {
+        if (states == null) return "";
+        StringBuffer str = new StringBuffer();
+        for (Iterator it = states.iterator(); it.hasNext(); ) {
             str.append(it.next());
             if (it.hasNext()) {
                 str.append(",");
             }
         }
         return str.toString();
+    }
+
+    private void initStorage(final int capacity) {
+        if (states == null) {
+            states = new Vector(capacity);
+        }
+    }
+
+    private void initStorage() {
+        if (states == null) {
+            states = new Vector();
+        }
     }
 }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Wed Sep  6 09:06:15 2006
@@ -98,8 +98,7 @@
     </target>
 
     <target name="build.native"
-            depends="-build.native.linux,-build.native.windows"
-            if="with.awt.swing">
+            depends="-build.native.linux,-build.native.windows">
 
         <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
@@ -164,8 +163,7 @@
     </target>
 
     <target name="clean.native"
-            depends="-clean.native.linux,-clean.native.windows"
-            if="with.awt.swing">
+            depends="-clean.native.linux,-clean.native.windows">
         <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}"
               target="clean"/>
         <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os}"
@@ -233,14 +231,14 @@
         </copy>    
     </target>
 
-    <target name="run.tests" if="with.awt.swing.tests">
+    <target name="run.tests" if="with.awt.swing">
 
         <mkdir dir="${hy.tests.reports}" />
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <junit fork="yes"
-               forkmode="once"
+               forkmode="perTest"
                printsummary="withOutAndErr"
                errorproperty="test.errors"
                failureproperty="test.failures"
@@ -272,9 +270,45 @@
                     <exclude name="org/apache/harmony/awt/gl/MultiRectAreaTestCase.java"/>
                     <exclude name="java/awt/datatransfer/SystemFlavorMapTest.java"/>
                     <exclude name="java/awt/MenuTest.java"/>
+
+                    <exclude name="java/awt/AccessibleAWTCanvasTest.java"/>
+                    <exclude name="java/awt/AccessibleAWTComponentTest.java"/>
+                    <exclude name="java/awt/AccessibleAWTContainerTest.java"/>
+                    <exclude name="java/awt/AccessibleAWTListChildTest.java"/>
+                    <exclude name="java/awt/AccessibleAWTMenuItemTest.java"/>
+                    <exclude name="java/awt/AccessibleAWTWindowTest.java"/>
+                    <exclude name="java/awt/FileDialogTest.java"/>
+                    <exclude name="java/awt/DimensionTest.java"/>
+                    <exclude name="java/awt/FlowLayoutTest.java"/>
+                    <exclude name="java/awt/GridBagLayoutTest.java"/>
+                    <exclude name="java/awt/GridLayoutTest.java"/>
+                    <exclude name="java/awt/RobotTest.java"/>
+                    <exclude name="java/awt/WindowTest.java"/>
+                    <exclude name="java/awt/WindowRTest.java"/>
+                    <exclude name="java/awt/datatransfer/ClipboardTest.java"/>
+                    <exclude name="java/awt/BorderLayoutTest.java"/>
+                    <exclude name="java/awt/ButtonRTest.java"/>
+                    <exclude name="java/awt/CardLayoutTest.java"/>
+                    <exclude name="java/awt/ChoiceTest.java"/>
+                    <exclude name="java/awt/ComponentTest.java"/>
+                    <exclude name="java/awt/ContainerOrderFocusTraversalPolicyTest.java"/>
+                    <exclude name="java/awt/DialogRTest.java"/>
+                    <exclude name="java/awt/KeyboardFocusManagerRTest.java"/>
+                    <exclude name="java/awt/ListTest.java"/>
+                    <exclude name="java/awt/ScrollPaneAdjustableTest.java"/>
+                    <exclude name="java/awt/TextAreaTest.java"/>
+                    <exclude name="java/awt/TextComponentTest.java"/>
+                    <exclude name="java/awt/TextFieldTest.java"/>
+                    <exclude name="java/awt/dnd/DropTargetTest.java"/>
+                    <exclude name="java/awt/event/ContainerEventTest.java"/>
+                    <exclude name="java/awt/WinWindowRTest.java"/>
+                    <exclude name="org/apache/harmony/awt/gl/render/JavaBlitterTest.java"/>
+                    <exclude name="org/apache/harmony/awt/wtk/ShutdownWatchdogTest.java"/>
                 </fileset>
                 <fileset dir="${hy.awt.src.test.api.java.platform}">
                     <include name="**/*Test*.java"/>
+
+                    <exclude name="java/awt/WinWindowRTest.java"/>
                 </fileset>
             </batchtest>  
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt Wed Sep  6 09:06:15 2006
@@ -1,51 +1,52 @@
-# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-java/awt/*
-java/awt/color/*
-java/awt/datatransfer/*
-java/awt/dnd/*
-java/awt/dnd/peer/*
-java/awt/event/*
-java/awt/font/*
-java/awt/geom/*
-java/awt/im/*
-java/awt/image/*
-java/awt/image/renderable/*
-java/awt/im/spi/*
-java/awt/peer/*
-java/awt/print/*
-org/apache/harmony/awt/*
-org/apache/harmony/awt/datatransfer/*
-org/apache/harmony/awt/datatransfer/linux/*
-org/apache/harmony/awt/datatransfer/windows/*
-org/apache/harmony/awt/gl/*
-org/apache/harmony/awt/gl/color/*
-org/apache/harmony/awt/gl/font/*
-org/apache/harmony/awt/gl/image/*
-org/apache/harmony/awt/gl/linux/*
-org/apache/harmony/awt/gl/render/*
-org/apache/harmony/awt/gl/windows/*
-org/apache/harmony/awt/nativebridge/*
-org/apache/harmony/awt/nativebridge/linux/*
-org/apache/harmony/awt/nativebridge/windows/*
-org/apache/harmony/awt/state/*
-org/apache/harmony/awt/text/*
-org/apache/harmony/awt/theme/*
-org/apache/harmony/awt/theme/windows/*
-org/apache/harmony/awt/wtk/*
-org/apache/harmony/awt/wtk/linux/*
-org/apache/harmony/awt/wtk/windows/*
-
-org/apache/harmony/awt/internal/nls/*
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+java/awt/*
+java/awt/color/*
+java/awt/datatransfer/*
+java/awt/dnd/*
+java/awt/dnd/peer/*
+java/awt/event/*
+java/awt/font/*
+java/awt/geom/*
+java/awt/im/*
+java/awt/image/*
+java/awt/image/renderable/*
+java/awt/im/spi/*
+java/awt/peer/*
+java/awt/print/*
+org/apache/harmony/awt/*
+org/apache/harmony/awt/datatransfer/*
+org/apache/harmony/awt/datatransfer/linux/*
+org/apache/harmony/awt/datatransfer/windows/*
+org/apache/harmony/awt/gl/*
+org/apache/harmony/awt/gl/color/*
+org/apache/harmony/awt/gl/font/*
+org/apache/harmony/awt/gl/image/*
+org/apache/harmony/awt/gl/linux/*
+org/apache/harmony/awt/gl/render/*
+org/apache/harmony/awt/gl/windows/*
+org/apache/harmony/awt/im/*
+org/apache/harmony/awt/nativebridge/*
+org/apache/harmony/awt/nativebridge/linux/*
+org/apache/harmony/awt/nativebridge/windows/*
+org/apache/harmony/awt/state/*
+org/apache/harmony/awt/text/*
+org/apache/harmony/awt/theme/*
+org/apache/harmony/awt/theme/windows/*
+org/apache/harmony/awt/wtk/*
+org/apache/harmony/awt/wtk/linux/*
+org/apache/harmony/awt/wtk/windows/*
+
+org/apache/harmony/awt/internal/nls/*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEvent.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEvent.java Wed Sep  6 09:06:15 2006
@@ -67,98 +67,100 @@
 
     public static final int RESERVED_ID_MAX = 1999;
 
-    private static final Hashtable<Integer, EventDescriptor> eventsMap = new Hashtable<Integer, EventDescriptor>();
+    private static final Hashtable eventsMap = new Hashtable();
 
-    private static EventConverter converter;
+    private static EventConverter converter = null;
 
     protected int id;
 
     protected boolean consumed;
 
     boolean dispatchedByKFM;
+    
+    transient boolean isPosted;
 
     static {
-        eventsMap.put(Integer.valueOf(KeyEvent.KEY_TYPED),
+        eventsMap.put(new Integer(KeyEvent.KEY_TYPED),
                 new EventDescriptor(KEY_EVENT_MASK, KeyListener.class));
-        eventsMap.put(Integer.valueOf(KeyEvent.KEY_PRESSED),
+        eventsMap.put(new Integer(KeyEvent.KEY_PRESSED),
                 new EventDescriptor(KEY_EVENT_MASK, KeyListener.class));
-        eventsMap.put(Integer.valueOf(KeyEvent.KEY_RELEASED),
+        eventsMap.put(new Integer(KeyEvent.KEY_RELEASED),
                 new EventDescriptor(KEY_EVENT_MASK, KeyListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_CLICKED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_CLICKED),
                 new EventDescriptor(MOUSE_EVENT_MASK, MouseListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_PRESSED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_PRESSED),
                 new EventDescriptor(MOUSE_EVENT_MASK, MouseListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_RELEASED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_RELEASED),
                 new EventDescriptor(MOUSE_EVENT_MASK, MouseListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_MOVED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_MOVED),
                 new EventDescriptor(MOUSE_MOTION_EVENT_MASK, MouseMotionListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_ENTERED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_ENTERED),
                 new EventDescriptor(MOUSE_EVENT_MASK, MouseListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_EXITED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_EXITED),
                 new EventDescriptor(MOUSE_EVENT_MASK, MouseListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_DRAGGED),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_DRAGGED),
                 new EventDescriptor(MOUSE_MOTION_EVENT_MASK, MouseMotionListener.class));
-        eventsMap.put(Integer.valueOf(MouseEvent.MOUSE_WHEEL),
+        eventsMap.put(new Integer(MouseEvent.MOUSE_WHEEL),
                 new EventDescriptor(MOUSE_WHEEL_EVENT_MASK, MouseWheelListener.class));
-        eventsMap.put(Integer.valueOf(ComponentEvent.COMPONENT_MOVED),
+        eventsMap.put(new Integer(ComponentEvent.COMPONENT_MOVED),
                 new EventDescriptor(COMPONENT_EVENT_MASK, ComponentListener.class));
-        eventsMap.put(Integer.valueOf(ComponentEvent.COMPONENT_RESIZED),
+        eventsMap.put(new Integer(ComponentEvent.COMPONENT_RESIZED),
                 new EventDescriptor(COMPONENT_EVENT_MASK, ComponentListener.class));
-        eventsMap.put(Integer.valueOf(ComponentEvent.COMPONENT_SHOWN),
+        eventsMap.put(new Integer(ComponentEvent.COMPONENT_SHOWN),
                 new EventDescriptor(COMPONENT_EVENT_MASK, ComponentListener.class));
-        eventsMap.put(Integer.valueOf(ComponentEvent.COMPONENT_HIDDEN),
+        eventsMap.put(new Integer(ComponentEvent.COMPONENT_HIDDEN),
                 new EventDescriptor(COMPONENT_EVENT_MASK, ComponentListener.class));
-        eventsMap.put(Integer.valueOf(FocusEvent.FOCUS_GAINED),
+        eventsMap.put(new Integer(FocusEvent.FOCUS_GAINED),
                 new EventDescriptor(FOCUS_EVENT_MASK, FocusListener.class));
-        eventsMap.put(Integer.valueOf(FocusEvent.FOCUS_LOST),
+        eventsMap.put(new Integer(FocusEvent.FOCUS_LOST),
                 new EventDescriptor(FOCUS_EVENT_MASK, FocusListener.class));
-        eventsMap.put(Integer.valueOf(PaintEvent.PAINT),
+        eventsMap.put(new Integer(PaintEvent.PAINT),
                 new EventDescriptor(PAINT_EVENT_MASK, null));
-        eventsMap.put(Integer.valueOf(PaintEvent.UPDATE),
+        eventsMap.put(new Integer(PaintEvent.UPDATE),
                 new EventDescriptor(PAINT_EVENT_MASK, null));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_OPENED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_OPENED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_CLOSING),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_CLOSING),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_CLOSED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_CLOSED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_DEICONIFIED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_DEICONIFIED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_ICONIFIED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_ICONIFIED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_STATE_CHANGED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_STATE_CHANGED),
                 new EventDescriptor(WINDOW_STATE_EVENT_MASK, WindowStateListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_LOST_FOCUS),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_LOST_FOCUS),
                 new EventDescriptor(WINDOW_FOCUS_EVENT_MASK, WindowFocusListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_GAINED_FOCUS),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_GAINED_FOCUS),
                 new EventDescriptor(WINDOW_FOCUS_EVENT_MASK, WindowFocusListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_DEACTIVATED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_DEACTIVATED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(WindowEvent.WINDOW_ACTIVATED),
+        eventsMap.put(new Integer(WindowEvent.WINDOW_ACTIVATED),
                 new EventDescriptor(WINDOW_EVENT_MASK, WindowListener.class));
-        eventsMap.put(Integer.valueOf(HierarchyEvent.HIERARCHY_CHANGED),
+        eventsMap.put(new Integer(HierarchyEvent.HIERARCHY_CHANGED),
                 new EventDescriptor(HIERARCHY_EVENT_MASK, HierarchyListener.class));
-        eventsMap.put(Integer.valueOf(HierarchyEvent.ANCESTOR_MOVED),
+        eventsMap.put(new Integer(HierarchyEvent.ANCESTOR_MOVED),
                 new EventDescriptor(HIERARCHY_BOUNDS_EVENT_MASK, HierarchyBoundsListener.class));
-        eventsMap.put(Integer.valueOf(HierarchyEvent.ANCESTOR_RESIZED),
+        eventsMap.put(new Integer(HierarchyEvent.ANCESTOR_RESIZED),
                 new EventDescriptor(HIERARCHY_BOUNDS_EVENT_MASK, HierarchyBoundsListener.class));
-        eventsMap.put(Integer.valueOf(ContainerEvent.COMPONENT_ADDED),
+        eventsMap.put(new Integer(ContainerEvent.COMPONENT_ADDED),
                 new EventDescriptor(CONTAINER_EVENT_MASK, ContainerListener.class));
-        eventsMap.put(Integer.valueOf(ContainerEvent.COMPONENT_REMOVED),
+        eventsMap.put(new Integer(ContainerEvent.COMPONENT_REMOVED),
                 new EventDescriptor(CONTAINER_EVENT_MASK, ContainerListener.class));
-        eventsMap.put(Integer.valueOf(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED),
+        eventsMap.put(new Integer(InputMethodEvent.INPUT_METHOD_TEXT_CHANGED),
                 new EventDescriptor(INPUT_METHOD_EVENT_MASK, InputMethodListener.class));
-        eventsMap.put(Integer.valueOf(InputMethodEvent.CARET_POSITION_CHANGED),
+        eventsMap.put(new Integer(InputMethodEvent.CARET_POSITION_CHANGED),
                 new EventDescriptor(INPUT_METHOD_EVENT_MASK, InputMethodListener.class));
-        eventsMap.put(Integer.valueOf(InvocationEvent.INVOCATION_DEFAULT),
+        eventsMap.put(new Integer(InvocationEvent.INVOCATION_DEFAULT),
                 new EventDescriptor(INVOCATION_EVENT_MASK, null));
-        eventsMap.put(Integer.valueOf(ItemEvent.ITEM_STATE_CHANGED),
+        eventsMap.put(new Integer(ItemEvent.ITEM_STATE_CHANGED),
                 new EventDescriptor(ITEM_EVENT_MASK, ItemListener.class));
-        eventsMap.put(Integer.valueOf(TextEvent.TEXT_VALUE_CHANGED),
+        eventsMap.put(new Integer(TextEvent.TEXT_VALUE_CHANGED),
                 new EventDescriptor(TEXT_EVENT_MASK, TextListener.class));
-        eventsMap.put(Integer.valueOf(ActionEvent.ACTION_PERFORMED),
+        eventsMap.put(new Integer(ActionEvent.ACTION_PERFORMED),
                 new EventDescriptor(ACTION_EVENT_MASK, ActionListener.class));
-        eventsMap.put(Integer.valueOf(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED),
+        eventsMap.put(new Integer(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED),
                 new EventDescriptor(ADJUSTMENT_EVENT_MASK, AdjustmentListener.class));
         converter = new EventConverter();
     }
@@ -263,23 +265,23 @@
 
         final long eventMask;
 
-        final Class<?> listenerType;
+        final Class listenerType;
 
-        EventDescriptor(long eventMask, Class<?> listenerType) {
+        EventDescriptor(long eventMask, Class listenerType) {
             this.eventMask = eventMask;
             this.listenerType = listenerType;
         }
 
     }
-    static final class EventTypeLookup<T> {
-        private AWTEvent lastEvent;
-        private EventDescriptor lastEventDescriptor;
+    static final class EventTypeLookup {
+        private AWTEvent lastEvent = null;
+        private EventDescriptor lastEventDescriptor = null;
 
         EventDescriptor getEventDescriptor(AWTEvent event) {
             synchronized (this) {
                 if (event != lastEvent) {
                     lastEvent = event;
-                    lastEventDescriptor = eventsMap.get(Integer.valueOf(event.id));
+                    lastEventDescriptor = (EventDescriptor) eventsMap.get(new Integer(event.id));
                 }
 
                 return lastEventDescriptor;
@@ -322,7 +324,7 @@
         Event convertAdjustmentEvent(AdjustmentEvent ae) {
             //TODO: Event.SCROLL_BEGIN/SCROLL_END
             return new Event(ae.source, ae.id + ae.getAdjustmentType() - 1,
-                    Integer.valueOf(ae.getValue()));
+                    new Integer(ae.getValue()));
         }
 
         Event convertComponentEvent(ComponentEvent ce) {
@@ -345,7 +347,7 @@
                 Choice choice = (Choice) source;
                 idx = choice.getSelectedIndex();
             }
-            Object arg = idx >= 0 ? Integer.valueOf(idx) : null;
+            Object arg = idx >= 0 ? new Integer(idx) : null;
             return new Event(source, oldId, arg);
         }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEventMulticaster.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEventMulticaster.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEventMulticaster.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTEventMulticaster.java Wed Sep  6 09:06:15 2006
@@ -23,7 +23,6 @@
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
-import java.lang.reflect.Array;
 
 import java.util.EventListener;
 import java.util.LinkedList;
@@ -66,18 +65,18 @@
         s.writeObject(l);
     }
 
-    public static <T extends EventListener> T[] getListeners(EventListener l,
-            Class<T> listenerType) throws ClassCastException
+    public static EventListener[] getListeners(EventListener l,
+            Class listenerType) throws ClassCastException
     {
-        T[] result = (T[])Array.newInstance(listenerType, 0);
-        if (l != null) {
-            LinkedList<EventListener> listeners = addListeners(l, listenerType, new LinkedList<EventListener>());
-            result = listeners.toArray(result);
+        if (l == null) {
+            return new EventListener[0];
+        } else {
+            return (EventListener[]) addListeners(l, listenerType, new LinkedList()).toArray
+                    ((EventListener[]) java.lang.reflect.Array.newInstance(listenerType, 0));
         }
-        return result;
     }
 
-    private static LinkedList<EventListener> addListeners(EventListener l, Class<?> listenerType, LinkedList<EventListener> list) {
+    private static LinkedList addListeners(EventListener l, Class listenerType, LinkedList list) {
         if (l instanceof AWTEventMulticaster) {
             AWTEventMulticaster ml = (AWTEventMulticaster) l;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java Wed Sep  6 09:06:15 2006
@@ -120,7 +120,7 @@
             key = new AWTKeyStroke();
         } else {
             try {
-                key = (AWTKeyStroke) subConstructor.newInstance((Object[])null);
+                key = (AWTKeyStroke) subConstructor.newInstance(null);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -276,7 +276,7 @@
             throw new ClassCastException("subclass is not derived from AWTKeyStroke");
         }
         try {
-            subConstructor = subclass.getDeclaredConstructor((Class[])null);
+            subConstructor = subclass.getDeclaredConstructor(null);
             subConstructor.setAccessible(true);
         } catch (SecurityException e) {
             throw new RuntimeException(e);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java Wed Sep  6 09:06:15 2006
@@ -743,8 +743,9 @@
 
     private boolean ignoreRepaint;
     private boolean enabled = true;
-    boolean inputMethodsEnabled = true;
-    private boolean focusable = true;       
+    private boolean inputMethodsEnabled = true;
+    transient boolean dispatchToIM = true;
+    private boolean focusable = true;       //By default, all Components return true from isFocusable() method
     boolean visible = true;
 
     private boolean calledSetFocusable;
@@ -1457,6 +1458,9 @@
             if(!isDisplayable()) return null;
 
             GraphicsConfiguration gc = getGraphicsConfiguration();
+            if (gc == null)
+                return null;
+            
             ColorModel cm = gc.getColorModel(Transparency.OPAQUE);
             WritableRaster wr = cm.createCompatibleWritableRaster(width, height);
             Image image = new BufferedImage(cm, wr, cm.isAlphaPremultiplied(), null);
@@ -1475,8 +1479,12 @@
             if(!isDisplayable()) {
                 return null;
             }
-            VolatileImage image = getGraphicsConfiguration().
-                    createCompatibleVolatileImage(width, height, caps);
+            
+            GraphicsConfiguration gc = getGraphicsConfiguration();
+            if (gc == null)
+                return null;
+            
+            VolatileImage image = gc.createCompatibleVolatileImage(width, height, caps);
 
             fillImageBackground(image, width, height);
             return image;
@@ -1491,8 +1499,12 @@
             if(!isDisplayable()) {
                 return null;
             }
-            VolatileImage image = getGraphicsConfiguration().
-                    createCompatibleVolatileImage(width, height);
+            
+            GraphicsConfiguration gc = getGraphicsConfiguration();
+            if (gc == null)
+                return null;
+            
+            VolatileImage image = gc.createCompatibleVolatileImage(width, height);
 
             fillImageBackground(image, width, height);
             return image;
@@ -1835,12 +1847,7 @@
     }
 
     public InputMethodRequests getInputMethodRequests() {
-        toolkit.lockAWT();
-        try {
-            return null;
-        } finally {
-            toolkit.unlockAWT();
-        }
+        return null;
     }
 
     public Locale getLocale() {
@@ -2430,6 +2437,9 @@
      * Calls InputContext.removeNotify
      */
     private void removeNotifyInputContext() {
+        if (!inputMethodsEnabled) {
+            return;
+        }
         InputContext ic = getInputContext();
         if (ic != null) {
             ic.removeNotify(this);
@@ -2526,6 +2536,7 @@
                 } else {
                     redrawManager.addUpdateRegion(this, new Rectangle(x, y, width, height));
                 }
+                toolkit.getSystemEventQueueCore().notifyEventMonitor(toolkit);
             }
 
         } finally {
@@ -2534,7 +2545,7 @@
     }
 
     void postEvent(AWTEvent e) {
-        getToolkit().getSystemEventQueue().postEvent(e);
+        getToolkit().getSystemEventQueueImpl().postEvent(e);
     }
 
     public void repaint(int x, int y, int width, int height) {
@@ -2677,7 +2688,11 @@
         notifyInputMethod(new Rectangle(x, y, w, h));
     }
 
-    void notifyInputMethod(Rectangle bounds) {
+    /**
+     * Calls InputContextImpl.notifyClientWindowChanged.
+     */
+    void notifyInputMethod(Rectangle bounds) {        
+        // only Window actually notifies IM of bounds change
     }
 
     private void setBoundsFields(int x, int y, int w, int h, int bMask) {
@@ -3258,10 +3273,11 @@
                 return new Dimension(minimumSize);
             }
             Dimension defSize = getDefaultMinimumSize();
-            if (defSize != null) {
-                return new Dimension(defSize);
+            if (defSize == null) {
+                defSize = (isDisplayable() ? new Dimension(1, 1) :
+                                             new Dimension(w, h));
             }
-            return new Dimension (w, h);
+            return new Dimension(defSize);
         } finally {
             toolkit.unlockAWT();
         }
@@ -3545,8 +3561,16 @@
                 }
             }
         }
-        AWTEvent.EventDescriptor descriptor = 
-            toolkit.eventTypeLookup.getEventDescriptor(e);
+            
+        if (inputMethodsEnabled && dispatchToIM && e.isPosted &&
+            dispatchEventToIM(e)) {
+            return;
+        }            
+        if (e.getID() == WindowEvent.WINDOW_ICONIFIED) {
+            notifyInputMethod(null);
+        }
+            
+        AWTEvent.EventDescriptor descriptor = toolkit.eventTypeLookup.getEventDescriptor(e);
 
         toolkit.dispatchAWTEvent(e);
         if (descriptor != null) {
@@ -3790,6 +3814,9 @@
     public void enableInputMethods(boolean enable) {
         toolkit.lockAWT();
         try {
+            if (!enable) {
+                removeNotifyInputContext();
+            }
             inputMethodsEnabled = enable;
         } finally {
             toolkit.unlockAWT();
@@ -4144,7 +4171,8 @@
         if (Thread.currentThread() instanceof EventDispatchThread) {
             r.run();
         } else {
-            toolkit.systemEventQueue.postEvent(new InvocationEvent(this, r));
+            toolkit.getSystemEventQueueImpl().postEvent(
+                    new InvocationEvent(this, r));
         }
     }
 
@@ -4344,5 +4372,34 @@
 
     void setTextFieldKit(TextFieldKit kit) {
         textFieldKit = kit;
+    }
+    
+    /**
+     * Dispatches input & focus events to input method
+     * context.
+     * @param e event to pass to InputContext.dispatchEvent()
+     * @return true if event was consumed by IM, false otherwise
+     */
+    private boolean dispatchEventToIM(AWTEvent e) {
+        InputContext ic = getInputContext();
+        if (ic == null) {
+            return false;
+        }
+        int id = e.getID();
+        boolean isInputEvent = 
+            ((id >= KeyEvent.KEY_FIRST) && 
+             (id <= KeyEvent.KEY_LAST)) ||
+            ((id >= MouseEvent.MOUSE_FIRST) &&
+             (id <= MouseEvent.MOUSE_LAST));
+        
+        if ( ((id >= FocusEvent.FOCUS_FIRST) &&
+              (id <= FocusEvent.FOCUS_LAST)) ||
+              isInputEvent) {
+            
+            ic.dispatchEvent(e);
+            
+        }
+        
+        return e.isConsumed();
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java Wed Sep  6 09:06:15 2006
@@ -309,8 +309,9 @@
 
         if (prevWindow != null) {
             // do the same thing as when native "focus gained" event comes on
-            // prevFocusedWindow
-            requestFocusInWindow(prevWindow, false);
+            // prevFocusedWindow, but call behavior
+            // to generate native event & activate ancestor Frame
+            requestFocusInWindow(prevWindow, true);
         } else {
             // If there is no such Window,
             // then the KeyboardFocusManager will clear the global focus owner.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java Wed Sep  6 09:06:15 2006
@@ -50,18 +50,9 @@
         int distance = 2; // TODO: use desktop property 
         MouseEvent e0 = (MouseEvent)events.get(0);
         if (e0.getPoint().distance(e.getPoint()) >= distance) {
-            int act = DnDConstants.ACTION_NONE;
-            if (e.isControlDown()) {
-                act = e.isShiftDown() ? 
-                        DnDConstants.ACTION_LINK : DnDConstants.ACTION_COPY;
-            } else {
-                act = DnDConstants.ACTION_MOVE;
-            }
-            act &= super.sourceActions;
-            
-            if (act != DnDConstants.ACTION_NONE) {
+            if (sourceActions != DnDConstants.ACTION_NONE) {
                 active = true;
-                fireDragGestureRecognized(act, e.getPoint());
+                fireDragGestureRecognized(sourceActions, e.getPoint());
             }
         }
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dialog.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dialog.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dialog.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dialog.java Wed Sep  6 09:06:15 2006
@@ -209,19 +209,26 @@
     public void hide() {
         toolkit.lockAWT();
         try {
-            if (modalContext != null && modalContext.isModalLoopRunning()) {
-                modalContext.endModalLoop();
-                super.hide();
-            }
-            else {
-                super.hide();
-            }
+            hideImpl();
         } finally {
             toolkit.unlockAWT();
         }
     }
-
+    
+    void hideImpl() {
+        if (modalContext != null && modalContext.isModalLoopRunning()) {
+            modalContext.endModalLoop();
+            super.hide();
+        } else {
+            super.hide();
+        }
+    }
+    
     public void show() {
+        showImpl();
+    }
+
+    void showImpl() {
         if (isModal()) {
             if (EventQueue.isDispatchThread()) {
                 showModal();
@@ -376,4 +383,11 @@
         return SystemColor.control;
     }
 
+    void runModalLoop() {
+        modalContext.runModalLoop();
+    }
+    
+    void endModalLoop() {
+        modalContext.endModalLoop();
+    }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dispatcher.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dispatcher.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Dispatcher.java Wed Sep  6 09:06:15 2006
@@ -36,8 +36,6 @@
  */
 class Dispatcher {
 
-    private final EventQueue eventQueue;
-
     final PopupDispatcher popupDispatcher = new PopupDispatcher();
 
     final FocusDispatcher focusDispatcher;
@@ -55,15 +53,13 @@
     int clickInterval = 250;
 
     /**
-     * @param queue - AWT's system event queue 
      * @param toolkit - AWT toolkit
      */
-    Dispatcher(EventQueue queue, Toolkit toolkit) {
-        eventQueue = queue;
+    Dispatcher(Toolkit toolkit) {
         this.toolkit = toolkit;
 
         focusDispatcher = new FocusDispatcher(toolkit);
-        mouseDispatcher = new MouseDispatcher(mouseGrabManager, queue, toolkit);
+        mouseDispatcher = new MouseDispatcher(mouseGrabManager, toolkit);
     }
 
     /**
@@ -165,8 +161,8 @@
             int id = event.getEventId();
 
             if (id == WindowEvent.WINDOW_CLOSING) {
-                eventQueue.postEvent(new WindowEvent(window,
-                        WindowEvent.WINDOW_CLOSING));
+                toolkit.getSystemEventQueueImpl().postEvent(
+                          new WindowEvent(window, WindowEvent.WINDOW_CLOSING));
 
                 return true;
             } else if (id == WindowEvent.WINDOW_STATE_CHANGED) {
@@ -258,6 +254,8 @@
                 src = KeyboardFocusManager.getCurrentKeyboardFocusManager().actualFocusOwner;
             }
 
+            EventQueue eventQueue = toolkit.getSystemEventQueueImpl();
+            
             if (src != null) {
                 eventQueue.postEvent(new KeyEvent(src, id, time, modifiers,
                         code, keyChar, location));

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java?view=diff&rev=440748&r1=440747&r2=440748
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java Wed Sep  6 09:06:15 2006
@@ -19,39 +19,28 @@
  */
 package java.awt;
 
-import org.apache.harmony.awt.wtk.*;
+import org.apache.harmony.awt.wtk.NativeEvent;
+import org.apache.harmony.awt.wtk.NativeEventQueue;
 
-/**
- * The thread that runs the main event loop, 
- * which handles both AWT events and native events.
- * 
- */
-final class EventDispatchThread extends Thread implements NativeEventListener {
+final class EventDispatchThread extends Thread  {
+    
+    private static final class MarkerEvent extends AWTEvent {
+        MarkerEvent(Object source, int id) {
+            super(source, id);
+        }
+    }
 
-    /**
-     * The AWT's system event queue
-     */
-    private EventQueue eventQueue;
     final Dispatcher dispatcher;
     final Toolkit toolkit;
     private NativeEventQueue nativeQueue;
 
-    private Runnable startupAction;
     private volatile boolean shutdownPending = false;
 
     /**
      * Initialise and run the main event loop
      */
     public void run() {
-        synchronized (this) {
-            try {
-                startupAction.run();
-                nativeQueue = toolkit.getNativeEventQueue();
-                nativeQueue.setNativeEventListener(this);
-            } finally {
-                notifyAll();
-            }
-        }
+        nativeQueue = toolkit.getNativeEventQueue();
 
         try {
             runModalLoop(null);
@@ -59,100 +48,66 @@
             e.printStackTrace();
         }
 
-        toolkit.stopShutdownThread();
-    }
-
-    /**
-     * Handle the native event
-     * @param event - the native event
-     * @return true if the default processing by OS is not needed
-     */
-    public boolean onEvent(NativeEvent event) {
-        return dispatcher.onEvent(event);
+        toolkit.shutdownWatchdog.forceShutdown();
     }
 
-    /**
-     * Dispatch the AWT events from the system event queue
-     */
-    public void onEventNestingEnd() {
-        boolean reloaded;
-
-        try {
-            do {
-                while(eventQueue.peekEvent() != null) {
-                    if (shutdownPending) {
-                        return;
-                    }
-                    eventQueue.dispatchEvent(eventQueue.getNextEvent());
+    void runModalLoop(ModalContext context) {
+        long lastPaintTime = System.currentTimeMillis();
+        while (!shutdownPending && (context == null || context.isModalLoopRunning())) {
+            EventQueue eventQueue = toolkit.getSystemEventQueueImpl();
+
+            NativeEvent ne = nativeQueue.getNextEvent();
+            if (ne != null) {
+                dispatcher.onEvent(ne);
+                MarkerEvent marker = new MarkerEvent(this, 0);
+                eventQueue.postEvent(marker);
+                for (AWTEvent ae = eventQueue.getNextEventNoWait(); 
+                        (ae != null) && (ae != marker); 
+                        ae = eventQueue.getNextEventNoWait()) {
+                    eventQueue.dispatchEvent(ae);
                 }
-
-                reloaded = false;
-                if (nativeQueue.isEmpty()) {
-                    toolkit.onQueueEmpty();
-                    if (shutdownPending) {
-                        return;
-                    }
-                    if (!eventQueue.isEmpty()) {
-                        reloaded = true;
+            } else {
+                toolkit.shutdownWatchdog.setNativeQueueEmpty(true);
+                AWTEvent ae = eventQueue.getNextEventNoWait();
+                if (ae != null) {
+                    eventQueue.dispatchEvent(ae);
+                    long curTime = System.currentTimeMillis();
+                    if (curTime - lastPaintTime > 10) {
+                        toolkit.onQueueEmpty();
+                        lastPaintTime = System.currentTimeMillis();
                     }
+                } else {
+                    toolkit.shutdownWatchdog.setAwtQueueEmpty(true);
+                    toolkit.onQueueEmpty();
+                    lastPaintTime = System.currentTimeMillis();
+                    waitForAnyEvent();
                 }
-            } while (reloaded);
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void onEventBegin() {
-        toolkit.lockAWT();
-        toolkit.validateShutdownThread();
-    }
-
-    public void onEventEnd() {
-        toolkit.unlockAWT();
-    }
-
-    public void onAwake() {
-        toolkit.validateShutdownThread();
-    }
-
-    public Synchronizer getSynchronizer() {
-        return toolkit.getSynchronizer();
-    }
-
-    public WTK getWTK() {
-        return toolkit.getWTK();
-    }
-
-    void startAndInit(Runnable startupAction) {
-        synchronized (this) {
-            this.startupAction = startupAction;
-            setName("AWT-EventQueue");
-            setDaemon(true);
-            start();
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                throw new RuntimeException("Attempt to shutdown AWT in wrong way.");
             }
         }
     }
-
-    void runModalLoop(ModalContext context) {
-        nativeQueue.onModalLoopBegin();
-        while (!shutdownPending && (context == null || context.isModalLoopRunning()) && nativeQueue.waitEvent()) {
-            nativeQueue.dispatchEventToListener();
+    
+    private void waitForAnyEvent() {
+        EventQueue eventQueue = toolkit.getSystemEventQueueImpl();
+        if (!eventQueue.isEmpty() || !nativeQueue.isEmpty()) {
+            return;
+        }
+        Object eventMonitor = nativeQueue.getEventMonitor();
+        synchronized(eventMonitor) {
+            try {
+                eventMonitor.wait();
+            } catch (InterruptedException e) {}
         }
-        nativeQueue.onModalLoopEnd();
     }
 
     void shutdown() {
         shutdownPending = true;
     }
 
-    EventDispatchThread(Toolkit toolkit, EventQueue eventQueue, Dispatcher dispatcher ) {
+    EventDispatchThread(Toolkit toolkit, Dispatcher dispatcher ) {
         this.toolkit = toolkit;
-        this.eventQueue = eventQueue;
         this.dispatcher = dispatcher;
+        setName("AWT-EventDispatchThread");
+        setDaemon(true);
     }
 
 }



Mime
View raw message