harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r601315 [1/11] - in /harmony/enhanced/classlib/branches/java6: depends/build/ modules/accessibility/src/main/java/javax/accessibility/ modules/accessibility/src/test/api/java/common/javax/accessibility/ modules/awt/src/main/java/common/java...
Date Wed, 05 Dec 2007 12:26:14 GMT
Author: tellison
Date: Wed Dec  5 04:25:42 2007
New Revision: 601315

URL: http://svn.apache.org/viewvc?rev=601315&view=rev
Log:
Merge updates between classlib trunk@r598224 and r601283
(except java.util.TreeMap)

Added:
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ReferralExceptionImpl.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ReferralExceptionImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/DefaultCallbackHandler.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextServerMockedTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextServerMockedTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ReferralExceptionTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ReferralExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/asn1/UtilsTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/asn1/UtilsTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ldapURLContextTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ldapURLContextTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/
      - copied from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/BindResponse.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/BindResponse.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/EncodableLdapResult.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/EncodableLdapResult.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/MockLdapMessage.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/MockLdapMessage.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/MockLdapServer.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/mock/MockLdapServer.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/BCIRenumberedAttribute.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/BCIRenumberedAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodeAttributeTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodeAttributeTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/SyncResolverImpl.java
      - copied, changed from r601283, harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/SyncResolverImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetTestCase.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetTestCase.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/SyncResolverTest.java
      - copied unchanged from r601283, harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/SyncResolverTest.java
Modified:
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleRelationSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxEvent.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphics2DFactory.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/gl_GDIPlus.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/IIOParam.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/ImageIO.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/ImageReader.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/IIOServiceProvider.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/ImageInputStreamSpi.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/ImageOutputStreamSpi.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/ImageReaderSpi.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/ImageWriterSpi.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageWriter.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageReader.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGImageWriter.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ExtendedOp.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapClient.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapMessage.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapResult.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaAttrDefContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaClassDefContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSearchResult.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapUtils.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/UnsolicitedNotificationImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ldapURLContext.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/sasl/SaslBind.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapSchemaContextImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapUtilsTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Proxy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractCollection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractSequentialList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ArrayList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Calendar.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Collection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Comparator.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ConcurrentModificationException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Date.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Dictionary.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/DuplicateFormatFlagsException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/EmptyStackException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Enumeration.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/EventListener.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/EventListenerProxy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/EventObject.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/FormatFlagsConversionMismatchException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Formattable.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/FormatterClosedException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashSet.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatCodePointException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatConversionException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatFlagsException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatPrecisionException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/IllegalFormatWidthException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Iterator.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedHashSet.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/LinkedList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/List.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ListIterator.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MapEntry.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatWidthException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingResourceException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/NoSuchElementException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Observer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Properties.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/PropertyResourceBundle.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/RandomAccess.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Set.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SortedMap.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SortedSet.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Stack.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/StringTokenizer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/TimeZone.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/TimeZones.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/TooManyListenersException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UUID.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Vector.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/StreamTokenizerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/GregorianCalendarTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/TreeMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/VectorTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentUtils.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ByteCode.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassFile.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BcBandsTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRow.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetWriter.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/filechooser/FileSystemView.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JComboBoxTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/filechooser/FileSystemViewTest.java

Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mk?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Wed Dec  5 04:25:42 2007
@@ -79,13 +79,13 @@
 MDLLIBFILES = $(LIBPATH)libhycommon.a
 
 ifeq ($(HY_NO_THR),false)
-MDLLIBFILES += $(DLLPATH)libhythr$(HY_SHLIB_SUFFIX)
+MDLLIBFILES += $(DLLPATH)libhythr$(HY_LINKLIB_SUFFIX)
 else
 DEFINES += -DHY_NO_THR
 endif
 
 ifeq ($(HY_NO_SIG),false)
-MDLLIBFILES += $(DLLPATH)libhysig$(HY_SHLIB_SUFFIX)
+MDLLIBFILES += $(DLLPATH)libhysig$(HY_LINKLIB_SUFFIX)
 else
 DEFINES += -DHY_NO_SIG
 endif
@@ -99,5 +99,5 @@
 OSLIBS += -lz
 MDLLIBZLIB =
 else
-MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX)
+MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
 endif

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java Wed Dec  5 04:25:42 2007
@@ -26,34 +26,58 @@
 import java.util.Vector;
 
 public class AccessibleRelationSet {
+
     protected Vector<AccessibleRelation> relations;
 
     public AccessibleRelationSet() {
-        initStorage();
+        super();
     }
 
     public AccessibleRelationSet(final AccessibleRelation[] relations) {
-        initStorage(relations.length);
-        addAll(relations);
+        if (relations.length != 0) {
+            this.relations = new Vector<AccessibleRelation>(relations.length);
+            for (AccessibleRelation relation : relations) {
+                add(relation);
+            }
+        }
     }
 
-    public boolean add(final AccessibleRelation relation) {
+    public boolean add(AccessibleRelation relation) {
         initStorage();
-        if (contains(relation.key)) {
-            return false;
+
+        AccessibleRelation currentRelation = get(relation.getKey());
+        if (currentRelation == null) {
+            relations.addElement(relation);
+            return true;
+        }
+
+        Object[] currentTarget = currentRelation.getTarget();
+        int combinedLength = currentTarget.length + relation.getTarget().length;
+        Object[] combinedTarget = new Object[combinedLength];
+
+        for (int i = 0; i < currentTarget.length; i++) {
+            combinedTarget[i] = currentTarget[i];
+        }
+        int index = 0;
+        for (int i = currentTarget.length; i < combinedLength; i++) {
+            combinedTarget[i] = relation.getTarget()[index++];
         }
-        relations.add(relation);
+
+        currentRelation.setTarget(combinedTarget);
+
         return true;
     }
 
-    public void addAll(final AccessibleRelation[] relations) {
-        initStorage(relations.length);
-        for (AccessibleRelation element : relations) {
-            add(element);
+    public void addAll(AccessibleRelation[] relations) {
+        if (relations.length != 0) {
+            initStorage();
+            for (AccessibleRelation relation : relations) {
+                add(relation);
+            }
         }
     }
 
-    public boolean remove(final AccessibleRelation relation) {
+    public boolean remove(AccessibleRelation relation) {
         return relations != null && relations.remove(relation);
     }
 
@@ -67,16 +91,16 @@
         return relations == null ? 0 : relations.size();
     }
 
-    public boolean contains(final String key) {
+    public boolean contains(String key) {
         return get(key) != null;
     }
 
-    public AccessibleRelation get(final String key) {
+    public AccessibleRelation get(String key) {
         if (relations == null) {
             return null;
         }
         for (AccessibleRelation rel : relations) {
-            if(key.equals(rel.key)) {
+            if (key.equals(rel.key)) {
                 return rel;
             }
         }
@@ -84,8 +108,8 @@
     }
 
     public AccessibleRelation[] toArray() {
-        return relations == null ? new AccessibleRelation[0] :
-            relations.toArray(new AccessibleRelation[relations.size()]);
+        return relations == null ? new AccessibleRelation[0] : relations
+                .toArray(new AccessibleRelation[relations.size()]);
     }
 
     @Override
@@ -94,7 +118,8 @@
             return ""; //$NON-NLS-1$
         }
         StringBuffer result = new StringBuffer();
-        for (Iterator<AccessibleRelation> it = relations.iterator(); it.hasNext(); ) {
+        for (Iterator<AccessibleRelation> it = relations.iterator(); it
+                .hasNext();) {
             result.append(it.next());
             if (it.hasNext()) {
                 result.append(","); //$NON-NLS-1$
@@ -103,15 +128,8 @@
         return result.toString();
     }
 
-
-    private void initStorage(final int capacity) {
-        if(relations == null) {
-            relations = new Vector<AccessibleRelation>(capacity);
-        }
-    }
-
     private void initStorage() {
-        if(relations == null) {
+        if (relations == null) {
             relations = new Vector<AccessibleRelation>();
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java Wed Dec  5 04:25:42 2007
@@ -26,15 +26,24 @@
 import java.util.Vector;
 
 public class AccessibleStateSet {
+
     protected Vector<AccessibleState> states;
 
     public AccessibleStateSet() {
-        initStorage();
+        super();
     }
 
-    public AccessibleStateSet(final AccessibleState[] states) {
-        initStorage(states.length);
-        addAll(states);
+    public AccessibleStateSet(AccessibleState[] states) {
+        super();
+        if (states.length == 0) {
+            return;
+        }
+        this.states = new Vector<AccessibleState>(states.length);
+        for (AccessibleState element : states) {
+            if (!this.states.contains(element)) {
+                this.states.addElement(element);
+            }
+        }
     }
 
     public boolean add(final AccessibleState state) {
@@ -47,17 +56,22 @@
     }
 
     public void addAll(final AccessibleState[] states) {
+        if (states.length == 0) {
+            return;
+        }
         initStorage(states.length);
         for (AccessibleState element : states) {
-            add(element);
+            if (!this.states.contains(element)) {
+                this.states.addElement(element);
+            }
         }
     }
 
-    public boolean contains(final AccessibleState state) {
+    public boolean contains(AccessibleState state) {
         return states == null ? false : states.contains(state);
     }
 
-    public boolean remove(final AccessibleState state) {
+    public boolean remove(AccessibleState state) {
         return states == null ? false : states.remove(state);
     }
 
@@ -68,17 +82,17 @@
     }
 
     public AccessibleState[] toArray() {
-        return states == null ? new AccessibleState[0] :
-            states.toArray(new AccessibleState[states.size()]);
+        return states == null ? new AccessibleState[0] : states
+                .toArray(new AccessibleState[states.size()]);
     }
 
     @Override
     public String toString() {
         if (states == null) {
-            return "null"; //$NON-NLS-1$
+            return null;
         }
         StringBuffer str = new StringBuffer();
-        for (Iterator<AccessibleState> it = states.iterator(); it.hasNext(); ) {
+        for (Iterator<AccessibleState> it = states.iterator(); it.hasNext();) {
             str.append(it.next().toString());
             if (it.hasNext()) {
                 str.append(","); //$NON-NLS-1$
@@ -99,4 +113,3 @@
         }
     }
 }
-

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleRelationSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleRelationSetTest.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleRelationSetTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleRelationSetTest.java Wed Dec  5 04:25:42 2007
@@ -17,6 +17,8 @@
 
 package javax.accessibility;
 
+import java.util.Vector;
+
 import junit.framework.TestCase;
 
 public class AccessibleRelationSetTest extends TestCase {
@@ -50,13 +52,17 @@
     }
 
     public void testAddContains() {
-        assertTrue("Should contain added item", set.contains(AccessibleRelation.CONTROLLED_BY));
-        assertTrue("Should contain added item", set.contains(AccessibleRelation.MEMBER_OF));
+        assertTrue("Should contain added item", set
+                .contains(AccessibleRelation.CONTROLLED_BY));
+        assertTrue("Should contain added item", set
+                .contains(AccessibleRelation.MEMBER_OF));
 
-        AccessibleRelation relation = new AccessibleRelation(AccessibleRelation.CONTROLLER_FOR);
+        AccessibleRelation relation = new AccessibleRelation(
+                AccessibleRelation.CONTROLLER_FOR);
+        assertTrue(set.add(relation));
         assertTrue(set.add(relation));
-        assertFalse(set.add(relation));
-        assertTrue("Should contain added item", set.contains(AccessibleRelation.CONTROLLER_FOR));
+        assertTrue("Should contain added item", set
+                .contains(AccessibleRelation.CONTROLLER_FOR));
         assertFalse("Should not contain not added item", set
                 .contains(AccessibleRelation.LABEL_FOR));
 
@@ -78,8 +84,8 @@
     public void testDupes() {
         AccessibleRelation dupeRelation = new AccessibleRelation(
                 AccessibleRelation.CONTROLLED_BY);
-        assertFalse("Should not add duplicate item", set.add(dupeRelation));
-        assertFalse("Should not add duplicate item", set.add(relations[0]));
+        assertTrue("Add duplicate item", set.add(dupeRelation));
+        assertTrue("Add duplicate item", set.add(relations[0]));
         assertNotSame(dupeRelation, set.get(AccessibleRelation.CONTROLLED_BY));
         assertSame(relations[0], set.get(AccessibleRelation.CONTROLLED_BY));
         set.remove(set.get(AccessibleRelation.CONTROLLED_BY));
@@ -87,8 +93,8 @@
         set.relations = null;
         set.addAll(relations);
         set.addAll(relations);
-        assertEquals("Should not add duplicate items in addAll", relations.length,
-                set.relations.size());
+        assertEquals("Should not add duplicate items in addAll",
+                relations.length, set.relations.size());
     }
 
     public void testGet() {
@@ -111,12 +117,29 @@
 
     public void testToString() {
         String stateSetString = set.toString();
-        assertTrue("String representation should contain elements representation",
+        assertTrue(
+                "String representation should contain elements representation",
                 stateSetString.indexOf(relations[0].toString()) >= 0);
-        assertTrue("String representation should contain elements representation",
+        assertTrue(
+                "String representation should contain elements representation",
                 stateSetString.indexOf(relations[1].toString()) >= 0);
 
         set.relations = null;
         set.toString();
+    }
+
+    // Regression for HARMONY-2457
+    public void test_constructor() {
+        TestAccessibleRelationSet obj = new TestAccessibleRelationSet();
+        assertNull(obj.relations);
+    }
+
+    static class TestAccessibleRelationSet extends AccessibleRelationSet {
+        Vector relations;
+
+        TestAccessibleRelationSet() {
+            super();
+            relations = super.relations;
+        }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java Wed Dec  5 04:25:42 2007
@@ -18,6 +18,7 @@
 package javax.accessibility;
 
 import java.util.Arrays;
+import java.util.Vector;
 
 import junit.framework.TestCase;
 
@@ -29,7 +30,8 @@
     @Override
     public void setUp() {
         stateSet = new AccessibleStateSet();
-        statesArray = new AccessibleState[] { AccessibleState.ACTIVE, AccessibleState.ARMED };
+        statesArray = new AccessibleState[] { AccessibleState.ACTIVE,
+                AccessibleState.ARMED };
         stateSet.addAll(statesArray);
     }
 
@@ -40,7 +42,8 @@
     }
 
     public void testAccessibleStateSet() throws Exception {
-        AccessibleState[] statesArray = { AccessibleState.ACTIVE, AccessibleState.ARMED };
+        AccessibleState[] statesArray = { AccessibleState.ACTIVE,
+                AccessibleState.ARMED };
         stateSet = new AccessibleStateSet(statesArray);
         assertNotNull(stateSet.states);
 
@@ -52,8 +55,10 @@
     }
 
     public void testAddContains() throws Exception {
-        assertTrue("Must contain added state", stateSet.contains(AccessibleState.ACTIVE));
-        assertTrue("Must contain added state", stateSet.contains(AccessibleState.ARMED));
+        assertTrue("Must contain added state", stateSet
+                .contains(AccessibleState.ACTIVE));
+        assertTrue("Must contain added state", stateSet
+                .contains(AccessibleState.ARMED));
         boolean added = stateSet.add(AccessibleState.ACTIVE);
         assertEquals("Should not add duplicate item", 2, stateSet.states.size());
         assertFalse("Should not add duplicate item", added);
@@ -73,8 +78,8 @@
     public void testAddAll() {
         stateSet.addAll(statesArray);
         stateSet.addAll(statesArray);
-        assertEquals("Should not add duplicate items", statesArray.length, stateSet.states
-                .size());
+        assertEquals("Should not add duplicate items", statesArray.length,
+                stateSet.states.size());
 
         try {
             stateSet.addAll(null);
@@ -87,7 +92,8 @@
         boolean removed = stateSet.remove(AccessibleState.ICONIFIED);
         assertFalse("Should not remove non-existing item", removed);
         removed = stateSet.remove(AccessibleState.ACTIVE);
-        assertFalse("Should remove existing item", stateSet.contains(AccessibleState.ACTIVE));
+        assertFalse("Should remove existing item", stateSet
+                .contains(AccessibleState.ACTIVE));
         assertTrue("Should remove existing item", removed);
     }
 
@@ -102,9 +108,11 @@
 
     public void testToString() throws Exception {
         String stateSetString = stateSet.toString();
-        assertTrue("String representation should contain elements representation",
+        assertTrue(
+                "String representation should contain elements representation",
                 stateSetString.indexOf(AccessibleState.ACTIVE.toString()) >= 0);
-        assertTrue("String representation should contain elements representation",
+        assertTrue(
+                "String representation should contain elements representation",
                 stateSetString.indexOf(AccessibleState.ARMED.toString()) >= 0);
 
         stateSet.states = null;
@@ -129,4 +137,20 @@
         stateSet.states = null;
         Arrays.asList(stateSet.toArray());
     }
+
+    // Regression for HARMONY-2457
+    public void test_constructor() {
+        TestAccessibleStateSet obj = new TestAccessibleStateSet();
+        assertNull(obj.states);
+    }
+
+    static class TestAccessibleStateSet extends AccessibleStateSet {
+        Vector states;
+
+        TestAccessibleStateSet() {
+            super();
+            states = super.states;
+        }
+    }
+
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java Wed Dec  5 04:25:42 2007
@@ -291,10 +291,6 @@
             validate(target);
             valid = wasValid;
 
-            if (visibleComponentsNumber == 0) {
-                return target.addInsets(new Dimension(0, 0));
-            }
-
             return target.addInsets(calculateLayoutSize(prefCompSizes));
         } finally {
             toolkit.unlockAWT();
@@ -429,16 +425,19 @@
         visibleComponentsNumber = 0;
 
         for (Component comp : components) {
-            if (comp.isVisible()) {
-                int index = constraints2Index(components2Constraints.get(comp),
-                        target.getComponentOrientation());
+            int index = constraints2Index(components2Constraints.get(comp),
+                    target.getComponentOrientation());
 
+            if (comp.isVisible()) {
                 if (visibleComponents[index] == null) {
                     visibleComponents[index] = comp;
                     visibleComponentsNumber++;
                     minCompSizes[index] = comp.getMinimumSize();
                     prefCompSizes[index] = comp.getPreferredSize();
                 }
+            } else if (visibleComponents[index] == null){
+                 minCompSizes[index] = comp.getMinimumSize();
+                 prefCompSizes[index] = comp.getPreferredSize();
             }
         }
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxEvent.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxEvent.java Wed Dec  5 04:25:42 2007
@@ -549,15 +549,17 @@
 
     private void translateButtonModifiers(int state) {
         translateModifiers(state);
+        
+        final int m = (mouseButton == MouseEvent.BUTTON1)
+            ? InputEvent.BUTTON1_DOWN_MASK
+            : (mouseButton == MouseEvent.BUTTON2) ? InputEvent.BUTTON2_DOWN_MASK
+            : (mouseButton == MouseEvent.BUTTON3) ? InputEvent.BUTTON3_DOWN_MASK 
+            : 0;
 
-        if (mouseButton == MouseEvent.BUTTON1) {
-            modifiers |= InputEvent.BUTTON1_DOWN_MASK;
-        }
-        if (mouseButton == MouseEvent.BUTTON2) {
-            modifiers |= InputEvent.BUTTON2_DOWN_MASK;
-        }
-        if (mouseButton == MouseEvent.BUTTON3) {
-            modifiers |= InputEvent.BUTTON3_DOWN_MASK;
+        if (eventId == MouseEvent.MOUSE_PRESSED) {
+            modifiers |= m;
+        } else if (eventId == MouseEvent.MOUSE_RELEASED) {
+            modifiers &= ~m;
         }
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDITextRenderer.java Wed Dec  5 04:25:42 2007
@@ -90,8 +90,8 @@
     @SuppressWarnings("deprecation")
     public void drawNormalGlyphVector(Graphics2D g, GlyphVector gv, float x, 
             float y) {
-        AffineTransform trans = ((WinGDIPGraphics2D)g).getTransform();
-        long hdc = ((WinGDIPGraphics2D)g).getDC();
+        AffineTransform trans = ((WinGDIGraphics2D)g).getTransform();
+        long hdc = ((WinGDIGraphics2D)g).getDC();
 
         x += trans.getTranslateX();
         y += trans.getTranslateY();
@@ -135,8 +135,8 @@
     @SuppressWarnings("deprecation")
     public void drawCompositeGlyphVector(Graphics2D g, GlyphVector gv, float x, 
             float y) {
-        AffineTransform trans = ((WinGDIPGraphics2D)g).getTransform();
-        long hdc = ((WinGDIPGraphics2D)g).getDC();
+        AffineTransform trans = ((WinGDIGraphics2D)g).getTransform();
+        long hdc = ((WinGDIGraphics2D)g).getDC();
 
         x += (int)Math.round(trans.getTranslateX());
         y += (int)Math.round(trans.getTranslateY());
@@ -194,7 +194,7 @@
      */
     @SuppressWarnings("deprecation")
     public void drawNormalString(Graphics2D g, String str, int x, int y) {
-        AffineTransform trans = ((WinGDIPGraphics2D)g).getTransform();
+        AffineTransform trans = ((WinGDIGraphics2D)g).getTransform();
 
         x += (int)Math.round(trans.getTranslateX());
         y += (int)Math.round(trans.getTranslateY());
@@ -202,8 +202,8 @@
         WindowsFont wf = (WindowsFont)(g.getFont().getPeer());
         long font = wf.getFontHandle();
         
-        long gi = ((WinGDIPGraphics2D)g).getGraphicsInfo();
-        long hdc = NativeFont.gdiPlusGetHDC(gi);
+        long gi = ((WinGDIGraphics2D)g).getGraphicsInfo();
+        long hdc = ((WinGDIGraphics2D)g).getDC();
 
         win32.SelectObject(hdc, font);
 
@@ -237,7 +237,6 @@
         String out = new String(chars, 0, j);
 
         win32.TextOutW(hdc, x, y - wf.getAscent(), out, j);
-        NativeFont.gdiPlusReleaseHDC(gi, hdc);
 
     }
 
@@ -259,10 +258,10 @@
             return;
         }
 
-        AffineTransform trans = ((WinGDIPGraphics2D)g).getTransform();
+        AffineTransform trans = ((WinGDIGraphics2D)g).getTransform();
 
-        long gi = ((WinGDIPGraphics2D)g).getGraphicsInfo();
-        long hdc = NativeFont.gdiPlusGetHDC(gi);
+        long gi = ((WinGDIGraphics2D)g).getGraphicsInfo();
+        long hdc = ((WinGDIGraphics2D)g).getDC();
         
         x += (int)Math.round(trans.getTranslateX());
         y += (int)Math.round(trans.getTranslateY());
@@ -320,7 +319,6 @@
 
         win32.TextOutW(hdc, xOffset, yOffset, 
                 str.substring(start, start + count), count);
-        NativeFont.gdiPlusReleaseHDC(gi, hdc);
     }
 
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIGraphics2D.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIGraphics2D.java Wed Dec  5 04:25:42 2007
@@ -143,11 +143,13 @@
         super.addRenderingHints(hints);
         if (!FontManager.IS_FONTLIB) {
             Object value = this.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+            /*
             if (value == RenderingHints.VALUE_ANTIALIAS_ON) {
                 NativeFont.setAntialiasing(gi,true);
             } else {
                 NativeFont.setAntialiasing(gi,false);
             }
+            */
         }
     }
     
@@ -342,9 +344,7 @@
     @Override
     public void fill(Shape s) {
         if (!nativeBrush || composite != AlphaComposite.SrcOver) {
-            s = transform.createTransformedShape(s);
-            MultiRectArea mra = jsr.rasterize(s, 0.5);
-            super.fillMultiRectAreaPaint(mra);
+            super.fill(s);
             return;
         }
 
@@ -356,9 +356,7 @@
     @Override
     public void fillRect(int x, int y, int width, int height) {
         if (!nativeBrush || composite != AlphaComposite.SrcOver) {
-            Shape s = transform.createTransformedShape(new Rectangle(x, y, width, height));
-            MultiRectArea mra = jsr.rasterize(s, 0.5);
-            super.fillMultiRectAreaPaint(mra);
+            super.fillRect(x, y, width, height);
             return;
         }
 
@@ -520,6 +518,7 @@
 
     // Creates native GraphicsInfo structure
     private native long createGraphicsInfo(long hwnd, int x, int y, int width, int height);
+    private native long createGraphicsInfoFor(long hdc, char pageUnit);
     static native long createCompatibleImageInfo(long hwnd, int width, int height);
     static native long createCompatibleImageInfo(byte[] bytes, int width, int height);
     private native long copyImageInfo(long gi);
@@ -559,11 +558,13 @@
         super.setRenderingHint(key,value);
         if (!FontManager.IS_FONTLIB) {
             Object val = this.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+            /*
             if (val == RenderingHints.VALUE_ANTIALIAS_ON) {
                 NativeFont.setAntialiasing(gi,true);
             } else {
                 NativeFont.setAntialiasing(gi,false);
             }
+            */
         }
     }
 
@@ -572,11 +573,13 @@
         super.setRenderingHints(hints);
         if (!FontManager.IS_FONTLIB) {
             Object value = this.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+            /*
             if (value == RenderingHints.VALUE_ANTIALIAS_ON) {
                 NativeFont.setAntialiasing(gi,true);
             } else {
                 NativeFont.setAntialiasing(gi,false);
             }
+            */
         }
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java Wed Dec  5 04:25:42 2007
@@ -359,7 +359,7 @@
 
     @Override
     public void drawOval(int x, int y, int width, int height) {
-        if (!nativePen) {
+        if (!nativePen || composite != AlphaComposite.SrcOver) {
             super.drawOval(x, y, width, height);
             return;
         }
@@ -370,9 +370,7 @@
     @Override
     public void fill(Shape s) {
         if (!nativeBrush || composite != AlphaComposite.SrcOver) {
-            s = transform.createTransformedShape(s);
-            MultiRectArea mra = jsr.rasterize(s, 0.5);
-            super.fillMultiRectAreaPaint(mra);
+            super.fill(s);
             return;
         }
 
@@ -384,9 +382,7 @@
     @Override
     public void fillRect(int x, int y, int width, int height) {
         if (!nativeBrush || composite != AlphaComposite.SrcOver) {
-            Shape s = transform.createTransformedShape(new Rectangle(x, y, width, height));
-            MultiRectArea mra = jsr.rasterize(s, 0.5);
-            super.fillMultiRectAreaPaint(mra);
+            super.fillRect(x, y, width, height);
             return;
         }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphics2DFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphics2DFactory.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphics2DFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphics2DFactory.java Wed Dec  5 04:25:42 2007
@@ -49,18 +49,22 @@
         Insets ins = nw.getInsets();
         if (WinGraphicsDevice.useOpenGL) {
             return new OGLGraphics2D(nw, tx - ins.left, ty - ins.top, clip);
-        } else {
-            return new WinGDIPGraphics2D(nw, tx - ins.left, ty - ins.top, clip);
         }
+        if (WinGraphicsDevice.useGDI) {
+            return new WinGDIGraphics2D(nw, tx - ins.left, ty - ins.top, clip);
+        }
+        return new WinGDIPGraphics2D(nw, tx - ins.left, ty - ins.top, clip);
     }
 
     public Graphics2D getGraphics2D(NativeWindow nw, int tx, int ty, int width, int height) {
         Insets ins = nw.getInsets();
         if (WinGraphicsDevice.useOpenGL) {
             return new OGLGraphics2D(nw, tx - ins.left, ty - ins.top, width, height);
-        } else {
-            return new WinGDIPGraphics2D(nw, tx - ins.left, ty - ins.top, width, height);
         }
+        if (WinGraphicsDevice.useGDI) {
+            return new WinGDIGraphics2D(nw, tx - ins.left, ty - ins.top, width, height);
+        }
+        return new WinGDIPGraphics2D(nw, tx - ins.left, ty - ins.top, width, height);
     }
 
     public GraphicsEnvironment createGraphicsEnvironment(WindowFactory wf) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java Wed Dec  5 04:25:42 2007
@@ -53,9 +53,12 @@
     private byte []idBytes = null;
 
     static boolean useOpenGL;
+    static boolean useGDI;
     static {
         String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+        String gdi = System.getProperty("java2d.gdi"); //$NON-NLS-1$
         useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
+        useGDI = gdi != null && gdi.equals("true"); //$NON-NLS-1$
     };
 
     public WinGraphicsDevice(int left, int top, int right, int bottom, String id, boolean primary) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java Wed Dec  5 04:25:42 2007
@@ -59,7 +59,10 @@
         hwnd = nw.getId();
         this.width = width;
         this.height = height;
-        gi = WinGDIPGraphics2D.createCompatibleImageInfo(hwnd, width, height);
+        if(WinGraphicsDevice.useGDI)
+            gi = WinGDIGraphics2D.createCompatibleImageInfo(hwnd, width, height);
+        else
+            gi = WinGDIPGraphics2D.createCompatibleImageInfo(hwnd, width, height);
         surface = new BitmapSurface(gi , width, height);
     }
 
@@ -73,7 +76,10 @@
         this.gc = gc;
         this.width = width;
         this.height = height;
-        gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
+        if(WinGraphicsDevice.useGDI)
+            gi = WinGDIGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
+        else 
+            gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
         surface = new BitmapSurface(gi , width, height);
     }
 
@@ -86,11 +92,19 @@
     public Graphics2D createGraphics() {
         if (gi == 0) {
             if (hwnd != 0 && gc == null) {
-                gi = WinGDIPGraphics2D.createCompatibleImageInfo(hwnd, width, height);
+                if(WinGraphicsDevice.useGDI)
+                    gi = WinGDIGraphics2D.createCompatibleImageInfo(hwnd, width, height);
+                else 
+                    gi = WinGDIPGraphics2D.createCompatibleImageInfo(hwnd, width, height);
             } else if (hwnd == 0 && gc != null) {
-                gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
+                if(WinGraphicsDevice.useGDI)
+                    gi = WinGDIGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
+                else
+                    gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);
             }
         }
+        if(WinGraphicsDevice.useGDI)
+            return new WinGDIGraphics2D(this, width, height);
         return new WinGDIPGraphics2D(this, width, height);
     }
 
@@ -120,7 +134,10 @@
             return IMAGE_OK;
         }
         
-        gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);        
+        if(WinGraphicsDevice.useGDI)
+            gi = WinGDIGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);        
+        else 
+            gi = WinGDIPGraphics2D.createCompatibleImageInfo(((WinGraphicsDevice)gc.getDevice()).getIDBytes(), width, height);        
         return IMAGE_RESTORED;
     }
 
@@ -153,7 +170,10 @@
     @Override
     public void flush() {
         if (gi != 0) {
-            WinGDIPGraphics2D.disposeGraphicsInfo(gi);
+            if(WinGraphicsDevice.useGDI)
+                WinGDIGraphics2D.disposeGraphicsInfo(gi);
+            else 
+                WinGDIPGraphics2D.disposeGraphicsInfo(gi);
             gi = 0;
         }
         if (surface != null) surface.dispose();

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp Wed Dec  5 04:25:42 2007
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 
-#include "gl_GDI.h"
+#include "gl_GDIPlus.h"
 #include "java_awt_BasicStroke.h"
 #include "java_awt_geom_PathIterator.h"
 #include "org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h"
@@ -79,11 +79,30 @@
     //initialize default transform
     XFORM xform; xform.eM11=1; xform.eM12=0;  xform.eM21=0;  xform.eM22=1;  xform.eDx=0;  xform.eDy=0;
     gi->xform = xform;
+    gi->gclip = CreateRectRgn(x,y,x+width,y+height);
 
     return (jlong)gi;
 }
 
 /*
+ * Class:     org_apache_harmony_awt_gl_windows_WinGDIGraphics2D
+ * Method:    createGraphicsInfoFor
+ * Signature: (JC)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_awt_gl_windows_WinGDIGraphics2D_createGraphicsInfoFor
+  (JNIEnv * env, jobject obj, jlong hdc, jchar pageUnit) {
+        GraphicsInfo * gi = (GraphicsInfo *) malloc(sizeof(GraphicsInfo));
+
+    gi->hdc = (HDC) hdc;
+    gi->hpen = NULL;
+    gi->hbrush = NULL;
+    //initialize default transform
+    XFORM xform; xform.eM11=1; xform.eM12=0;  xform.eM21=0;  xform.eM22=1;  xform.eDx=0;  xform.eDy=0;
+    gi->xform = xform;
+    return (jlong)gi;
+}
+
+/*
  * Creates compatible GraphicsInfo structure for specified device context
  */
 static inline GraphicsInfo *createCompatibleImageInfo(JNIEnv *env, HDC hdc, jint width, jint height) {
@@ -124,6 +143,9 @@
 
     XFORM xform; xform.eM11=1; xform.eM12=0;  xform.eM21=0;  xform.eM22=1;  xform.eDx=0;  xform.eDy=0;
     gi->xform = xform;
+    gi->gclip = CreateRectRgn(0, 0, width, height);
+    SelectClipRgn(gi->hdc, gi->gclip);
+
     return gi; 
 }
 
@@ -177,6 +199,7 @@
     XFORM xform; xform.eM11=origgi->xform.eM11; xform.eM12=origgi->xform.eM12;  xform.eM21=origgi->xform.eM21;  xform.eM22=origgi->xform.eM22;  xform.eDx=origgi->xform.eDx;  xform.eDy=origgi->xform.eDy;
     gi->xform = xform;
     gi->hrgn = NULL;
+    gi->gclip = origgi->gclip;
 
     return (jlong)gi;
 }
@@ -199,6 +222,9 @@
     if(gi->hrgn){
         DeleteObject(gi->hrgn);
     }
+    if(gi->gclip){
+        DeleteObject(gi->gclip);
+    }
     if(gi->hbrush)
         DeleteObject(gi->hbrush);
 
@@ -727,7 +753,7 @@
     GraphicsInfo *gi = (GraphicsInfo *)gip;
     DeleteObject(gi->hrgn);
     gi->hrgn = NULL;
-    SelectClipRgn(gi->hdc, NULL);
+    SelectClipRgn(gi->hdc, gi->gclip);
 }
 
 /*

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/gl_GDIPlus.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/gl_GDIPlus.h?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/gl_GDIPlus.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/gl_GDIPlus.h Wed Dec  5 04:25:42 2007
@@ -36,6 +36,13 @@
     HBITMAP bmp;
     Matrix *matrix;
     Region *clip;
+
+    HPEN hpen;
+    HBRUSH hbrush;
+    COLORREF color;
+    XFORM xform;
+    HRGN hrgn;
+    HRGN gclip;
 } GraphicsInfo;
 
 typedef struct _GLBITMAPINFO{

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h Wed Dec  5 04:25:42 2007
@@ -71,6 +71,14 @@
 
 /*
  * Class:     org_apache_harmony_awt_gl_windows_WinGDIGraphics2D
+ * Method:    createGraphicsInfoFor
+ * Signature: (JC)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_awt_gl_windows_WinGDIGraphics2D_createGraphicsInfoFor
+  (JNIEnv *, jobject, jlong, jchar);
+
+/*
+ * Class:     org_apache_harmony_awt_gl_windows_WinGDIGraphics2D
  * Method:    createCompatibleImageInfo
  * Signature: (JII)J
  */

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile Wed Dec  5 04:25:42 2007
@@ -29,6 +29,7 @@
 BUILDFILES = \
   BitmapSurface.obj \
   GDIBlitter.obj \
+  WinGDIGraphics2D.obj \
   WinGDIPGraphics2D.obj \
   WinGraphicsEnvironment.obj \
   WinThemeGraphics.obj \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/event/MouseEventTest.java Wed Dec  5 04:25:42 2007
@@ -22,7 +22,10 @@
 
 import java.awt.Button;
 import java.awt.Component;
+import java.awt.Frame;
+import java.awt.MouseInfo;
 import java.awt.Point;
+import java.awt.Robot;
 
 import junit.framework.TestCase;
 
@@ -144,5 +147,82 @@
         assertEquals(
                 event.paramString(),
                 "unknown type,(100,200),button=1,modifiers=Alt+Button2,extModifiers=Alt+Button2,clickCount=10");
+    }
+    
+    public void testHarmony5215() throws Exception {
+        final Frame f = new Frame();
+        final Point l = MouseInfo.getPointerInfo().getLocation();
+        final Robot r = new Robot();
+        final MouseEvent[] e = new MouseEvent[1];
+
+        f.addMouseListener(new MouseAdapter() {
+            public void mouseReleased(final MouseEvent event) {
+                synchronized (e) {
+                    e[0] = event;
+                    e.notify();
+                }
+            }
+
+            public void mousePressed(final MouseEvent event) {
+                synchronized (e) {
+                    e[0] = event;
+                    e.notify();
+                }
+            }
+        });
+
+        f.setSize(100, 100);
+        f.setVisible(true);
+        r.mouseMove(f.getX() + 50, f.getY() + 50);
+
+        try {
+            synchronized (e) {
+                r.mousePress(InputEvent.BUTTON1_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON1_MASK, e[0].getModifiers());
+                assertEquals(InputEvent.BUTTON1_DOWN_MASK,
+                    e[0].getModifiersEx());
+
+                r.mouseRelease(InputEvent.BUTTON1_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON1_MASK, e[0].getModifiers());
+                assertEquals(0, e[0].getModifiersEx());
+
+                r.mousePress(InputEvent.BUTTON1_MASK);
+                e.wait(5000);
+                r.mousePress(InputEvent.BUTTON2_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON2_MASK, e[0].getModifiers());
+                assertEquals(InputEvent.BUTTON1_DOWN_MASK
+                    | InputEvent.BUTTON2_DOWN_MASK, e[0].getModifiersEx());
+
+                r.mouseRelease(InputEvent.BUTTON2_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON2_MASK, e[0].getModifiers());
+                assertEquals(InputEvent.BUTTON1_DOWN_MASK,
+                    e[0].getModifiersEx());
+
+                r.mousePress(InputEvent.BUTTON2_MASK);
+                e.wait(5000);
+                r.mousePress(InputEvent.BUTTON3_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON3_MASK, e[0].getModifiers());
+                assertEquals(InputEvent.BUTTON1_DOWN_MASK
+                    | InputEvent.BUTTON2_DOWN_MASK
+                    | InputEvent.BUTTON3_DOWN_MASK, e[0].getModifiersEx());
+
+                r.mouseRelease(InputEvent.BUTTON3_MASK);
+                e.wait(5000);
+                assertEquals(InputEvent.BUTTON3_MASK, e[0].getModifiers());
+                assertEquals(InputEvent.BUTTON1_DOWN_MASK
+                    | InputEvent.BUTTON2_DOWN_MASK, e[0].getModifiersEx());
+            }
+        } finally {
+            r.mouseRelease(InputEvent.BUTTON1_MASK);
+            r.mouseRelease(InputEvent.BUTTON2_MASK);
+            r.mouseRelease(InputEvent.BUTTON3_MASK);
+            r.mouseMove(l.x, l.y);
+            f.dispose();
+        }
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java Wed Dec  5 04:25:42 2007
@@ -374,6 +374,28 @@
         assertNull(e.getArguments()[0]);
     }
 
+    public void testInstantiate_NPE() {
+
+        try {
+            testDefaultPersistenceDelegate obj = new testDefaultPersistenceDelegate();
+            obj.initialize(Object.class, null, new Object(), new Encoder());
+            fail("NullPointerException should be thrown");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+
+    class testDefaultPersistenceDelegate extends DefaultPersistenceDelegate {
+        testDefaultPersistenceDelegate() {
+            super();
+        }
+
+        public void initialize(Class<?> type, Object oldInstance,
+                Object newInstance, Encoder out) {
+            super.initialize(type, oldInstance, newInstance, out);
+        }
+    }
+        
     /*
      * Tests mutatesTo() under normal conditions without any properties.
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java Wed Dec  5 04:25:42 2007
@@ -17,13 +17,25 @@
 
 package org.apache.harmony.beans.tests.java.beans.beancontext;
 
+import java.beans.PropertyChangeListener;
+import java.beans.VetoableChangeListener;
 import java.beans.beancontext.BeanContext;
+import java.beans.beancontext.BeanContextChild;
+import java.beans.beancontext.BeanContextMembershipListener;
+import java.beans.beancontext.BeanContextServiceAvailableEvent;
+import java.beans.beancontext.BeanContextServiceProvider;
 import java.beans.beancontext.BeanContextServiceRevokedEvent;
+import java.beans.beancontext.BeanContextServiceRevokedListener;
 import java.beans.beancontext.BeanContextServices;
+import java.beans.beancontext.BeanContextServicesListener;
 import java.beans.beancontext.BeanContextServicesSupport;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.Locale;
 
 import junit.framework.TestCase;
@@ -86,14 +98,14 @@
         } catch (NullPointerException e) {
             // expected
         }
-        
+
         try {
             event.isServiceClass(null);
             fail("NPE expected");
         } catch (NullPointerException e) {
             // expected
         }
-        
+
         event = new MockBeanContextServiceRevokedEvent(services, services
                 .getClass(), true);
         assertFalse(event.isServiceClass(null));
@@ -123,6 +135,333 @@
         event = new BeanContextServiceRevokedEvent(sup,
                 MockBeanContextServices.class, false);
         assertNotNull(event.getSourceAsBeanContextServices());
+
+        // Regression for HARMONY-2506
+        BeanContextServiceRevokedEvent obj = new BeanContextServiceRevokedEvent(
+                new testBeanContextServices(), Integer.class, true);
+
+        obj.setPropagatedFrom(new testBeanContext());
+        assertNotNull(obj.getSourceAsBeanContextServices());
+    }
+
+    class testBeanContext implements BeanContext {
+        public void removeBeanContextMembershipListener(
+                BeanContextMembershipListener p0) {
+            return;
+        }
+
+        public void addBeanContextMembershipListener(
+                BeanContextMembershipListener p0) {
+            return;
+        }
+
+        public URL getResource(String p0, BeanContextChild p1) {
+            return null;
+        }
+
+        public InputStream getResourceAsStream(String p0, BeanContextChild p1) {
+            return null;
+        }
+
+        public Object instantiateChild(String p0) {
+            return null;
+        }
+
+        public void removeVetoableChangeListener(String p0,
+                VetoableChangeListener p1) {
+            return;
+        }
+
+        public void addVetoableChangeListener(String p0,
+                VetoableChangeListener p1) {
+            return;
+        }
+
+        public void removePropertyChangeListener(String p0,
+                PropertyChangeListener p1) {
+            return;
+        }
+
+        public void addPropertyChangeListener(String p0,
+                PropertyChangeListener p1) {
+            return;
+        }
+
+        public BeanContext getBeanContext() {
+            return null;
+        }
+
+        public void setBeanContext(BeanContext p0) {
+            return;
+        }
+
+        public int hashCode() {
+            return 0;
+        }
+
+        public boolean equals(Object p0) {
+            return false;
+        }
+
+        public void clear() {
+            return;
+        }
+
+        public boolean retainAll(Collection p0) {
+            return false;
+        }
+
+        public boolean removeAll(Collection p0) {
+            return false;
+        }
+
+        public boolean addAll(Collection p0) {
+            return false;
+        }
+
+        public boolean containsAll(Collection p0) {
+            return false;
+        }
+
+        public boolean remove(Object p0) {
+            return false;
+        }
+
+        public boolean add(Object p0) {
+            return false;
+        }
+
+        public Object[] toArray(Object[] p0) {
+            return null;
+        }
+
+        public Object[] toArray() {
+            return null;
+        }
+
+        public Iterator iterator() {
+            return null;
+        }
+
+        public boolean contains(Object p0) {
+            return false;
+        }
+
+        public boolean isEmpty() {
+            return false;
+        }
+
+        public int size() {
+            return 0;
+        }
+
+        public boolean isDesignTime() {
+            return false;
+        }
+
+        public void setDesignTime(boolean p0) {
+            return;
+        }
+
+        public boolean avoidingGui() {
+            return false;
+        }
+
+        public void okToUseGui() {
+            return;
+        }
+
+        public void dontUseGui() {
+            return;
+        }
+
+        public boolean needsGui() {
+            return false;
+        }
+    }
+
+    class testBeanContextServices implements BeanContextServices {
+        public void removeBeanContextServicesListener(
+                BeanContextServicesListener p0) {
+            return;
+        }
+
+        public void addBeanContextServicesListener(
+                BeanContextServicesListener p0) {
+            return;
+        }
+
+        public Iterator getCurrentServiceSelectors(Class p0) {
+            return null;
+        }
+
+        public Iterator getCurrentServiceClasses() {
+            return null;
+        }
+
+        public void releaseService(BeanContextChild p0, Object p1, Object p2) {
+            return;
+        }
+
+        public Object getService(BeanContextChild p0, Object p1, Class p2,
+                Object p3, BeanContextServiceRevokedListener p4) {
+            return null;
+        }
+
+        public boolean hasService(Class p0) {
+            return false;
+        }
+
+        public void revokeService(Class p0, BeanContextServiceProvider p1,
+                boolean p2) {
+            return;
+        }
+
+        public boolean addService(Class p0, BeanContextServiceProvider p1) {
+            return false;
+        }
+
+        public void removeBeanContextMembershipListener(
+                BeanContextMembershipListener p0) {
+            return;
+        }
+
+        public void addBeanContextMembershipListener(
+                BeanContextMembershipListener p0) {
+            return;
+        }
+
+        public URL getResource(String p0, BeanContextChild p1) {
+            return null;
+        }
+
+        public InputStream getResourceAsStream(String p0, BeanContextChild p1) {
+            return null;
+        }
+
+        public Object instantiateChild(String p0) {
+            return null;
+        }
+
+        public void removeVetoableChangeListener(String p0,
+                VetoableChangeListener p1) {
+            return;
+        }
+
+        public void addVetoableChangeListener(String p0,
+                VetoableChangeListener p1) {
+            return;
+        }
+
+        public void removePropertyChangeListener(String p0,
+                PropertyChangeListener p1) {
+            return;
+        }
+
+        public void addPropertyChangeListener(String p0,
+                PropertyChangeListener p1) {
+            return;
+        }
+
+        public BeanContext getBeanContext() {
+            return null;
+        }
+
+        public void setBeanContext(BeanContext p0) {
+            return;
+        }
+
+        public int hashCode() {
+            return 0;
+        }
+
+        public boolean equals(Object p0) {
+            return false;
+        }
+
+        public void clear() {
+            return;
+        }
+
+        public boolean retainAll(Collection p0) {
+            return false;
+        }
+
+        public boolean removeAll(Collection p0) {
+            return false;
+        }
+
+        public boolean addAll(Collection p0) {
+            return false;
+        }
+
+        public boolean containsAll(Collection p0) {
+            return false;
+        }
+
+        public boolean remove(Object p0) {
+            return false;
+        }
+
+        public boolean add(Object p0) {
+            return false;
+        }
+
+        public Object[] toArray(Object[] p0) {
+            return null;
+        }
+
+        public Object[] toArray() {
+            return null;
+        }
+
+        public Iterator iterator() {
+            return null;
+        }
+
+        public boolean contains(Object p0) {
+            return false;
+        }
+
+        public boolean isEmpty() {
+            return false;
+        }
+
+        public int size() {
+            return 0;
+        }
+
+        public boolean isDesignTime() {
+            return false;
+        }
+
+        public void setDesignTime(boolean p0) {
+            return;
+        }
+
+        public boolean avoidingGui() {
+            return false;
+        }
+
+        public void okToUseGui() {
+            return;
+        }
+
+        public void dontUseGui() {
+            return;
+        }
+
+        public boolean needsGui() {
+            return false;
+        }
+
+        public void serviceAvailable(BeanContextServiceAvailableEvent p0) {
+            return;
+        }
+
+        public void serviceRevoked(BeanContextServiceRevokedEvent p0) {
+            return;
+        }
     }
 
     public void testGetServiceClass() {
@@ -164,19 +503,19 @@
 
     }
 
-     public void testSerialization_Compatibility() throws Exception {
-         BeanContextServiceRevokedEvent event = new BeanContextServiceRevokedEvent(
-                 new MockBeanContextServices(), ArrayList.class, true);
-         event.setPropagatedFrom(new MockBeanContextDelegateS("from ID"));
-         SerializationTest.verifyGolden(this, event, new SerializableAssert(){
-             public void assertDeserialized(Serializable orig, Serializable ser) {
-                 assertEqualsSerially((BeanContextServiceRevokedEvent) orig,
-                         (BeanContextServiceRevokedEvent) ser);
-             }
-         });
-     }
-     
-     public void testConstructor() throws Exception {
+    public void testSerialization_Compatibility() throws Exception {
+        BeanContextServiceRevokedEvent event = new BeanContextServiceRevokedEvent(
+                new MockBeanContextServices(), ArrayList.class, true);
+        event.setPropagatedFrom(new MockBeanContextDelegateS("from ID"));
+        SerializationTest.verifyGolden(this, event, new SerializableAssert() {
+            public void assertDeserialized(Serializable orig, Serializable ser) {
+                assertEqualsSerially((BeanContextServiceRevokedEvent) orig,
+                        (BeanContextServiceRevokedEvent) ser);
+            }
+        });
+    }
+
+    public void testConstructor() throws Exception {
         BeanContextServices bcs = new MockBeanContextServices();
         BeanContextServiceRevokedEvent event = new BeanContextServiceRevokedEvent(
                 bcs, ArrayList.class, true);
@@ -187,7 +526,7 @@
         assertSame(bcs, event.getSourceAsBeanContextServices());
         assertFalse(event.isPropagated());
     }
-     
+
     private void assertEqualsSerially(BeanContextServiceRevokedEvent orig,
             BeanContextServiceRevokedEvent ser) {
         assertNull(ser.getSource());

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/IIOParam.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/IIOParam.java?rev=601315&r1=601314&r2=601315&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/IIOParam.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/IIOParam.java Wed Dec  5 04:25:42 2007
@@ -22,6 +22,8 @@
 
 import java.awt.*;
 
+import org.apache.harmony.luni.util.NotImplementedException;
+
 public abstract class IIOParam {
     protected Rectangle sourceRegion;
     protected int sourceXSubsampling = 1;
@@ -123,24 +125,24 @@
         return subsamplingYOffset;
     }
 
-    public void setSourceBands(int[] sourceBands) {
+    public void setSourceBands(int[] sourceBands) throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public int[] getSourceBands() {
+    public int[] getSourceBands() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public void setDestinationType(ImageTypeSpecifier destinationType) {
+    public void setDestinationType(ImageTypeSpecifier destinationType) throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public ImageTypeSpecifier getDestinationType() {
+    public ImageTypeSpecifier getDestinationType() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
     public void setDestinationOffset(Point destinationOffset) {
@@ -155,28 +157,28 @@
         return (Point) destinationOffset.clone();        
     }
 
-    public void setController(IIOParamController controller) {
+    public void setController(IIOParamController controller) throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public IIOParamController getController() {
+    public IIOParamController getController() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public IIOParamController getDefaultController() {
+    public IIOParamController getDefaultController() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public boolean hasController() {
+    public boolean hasController() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 
-    public boolean activateController() {
+    public boolean activateController() throws NotImplementedException {
         // TODO implement
-        throw new UnsupportedOperationException("not implemented yet");
+        throw new NotImplementedException();
     }
 }



Mime
View raw message