harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r562262 [1/6] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/platform/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/awt/src/main/java/unix/org/apache/harmon...
Date Thu, 02 Aug 2007 21:27:58 GMT
Author: tellison
Date: Thu Aug  2 14:27:53 2007
New Revision: 562262

URL: http://svn.apache.org/viewvc?view=rev&rev=562262
Log:
Merge updates between classlib trunk@r561012 and r562232.

Added:
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/ClassPersistenceDelegate.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/FieldPersistenceDelegate.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/MethodPersistenceDelegate.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/ProxyPersistenceDelegate.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StringPersistenceDelegate.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupport2Test.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/CorruptedSerBean.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/CorruptedSerBean.ser
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/EmptySerBean.ser
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/NotExistBean.ser   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/WrongSerBean.java   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/WrongSerBean.ser   (with props)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/WrongSerBean2.java   (with props)
Removed:
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/java_lang_ClassPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/java_lang_StringPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/java_lang_reflect_FieldPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/java_lang_reflect_MethodPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/java_lang_reflect_ProxyPersistenceDelegate.java
Modified:
    harmony/enhanced/classlib/branches/java6/NOTICE
    harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk   (props changed)
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk   (props changed)
    harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
    harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
    harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
    harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/GLXGraphicsConfiguration.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/nativebridge/linux/GLX.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/AWTPermissionTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanInfoImpl.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Encoder.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/PrimitiveWrapperPersistenceDelegate.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java-internal/java/beans/ClassPersistenceDelegateTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java-internal/java/beans/StringPersistenceDelegateTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupport2Test.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockNullSubClass.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockNullSubClassBeanInfo.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockNullSuperClass.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockNullSuperClassBeanInfo.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
    harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
    harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/RdnTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestInitialLdapContext.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/TestSortResponseControl.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
    harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashMap.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/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnectionManager.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/SecureCacheResponseTest.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/AbstractListTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/AbstractSequentialListTest.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/StackTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/impl/org/apache/harmony/tests/internal/net/www/protocol/http/PersistenceTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/math/build.xml
    harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.c   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/freebsd.x86/hysignal_context.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
    harmony/enhanced/classlib/branches/java6/modules/print/build.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/JointSet.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/javax/rmi/ssl/SslRMIClientSocketFactoryTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/javax/rmi/ssl/SslRMIServerSocketFactoryTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/security/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/.classpath
    harmony/enhanced/classlib/branches/java6/modules/swing/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/HTMLEditorKit.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/ParserDelegatorTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelSemanticTest.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/text/build.xml
    harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
    harmony/enhanced/classlib/branches/java6/support/src/test/java/javax/swing/text/parser/utils/DTDGetter.java   (props changed)

Modified: harmony/enhanced/classlib/branches/java6/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/NOTICE?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/NOTICE (original)
+++ harmony/enhanced/classlib/branches/java6/NOTICE Thu Aug  2 14:27:53 2007
@@ -5,7 +5,7 @@
    =========================================================================
 
 Apache Harmony
-Copyright 2006 The Apache Software Foundation
+Copyright 2006, 2007 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt (original)
+++ harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt Thu Aug  2 14:27:53 2007
@@ -197,6 +197,7 @@
 
 
 
+
 Visual C++ Runtime Files
 ========================
 
@@ -205,11 +206,13 @@
 
 
 
+
 ================================================================================
 ================================================================================
 
 
 
+
 License Notice for Bouncy Castle version 1.36
 ============================================
 
@@ -233,9 +236,14 @@
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
 
 
+
+
 ===============================================================================
 ===============================================================================
 
+
+
+
 License Notice for MX4J 3.0.2.
 ==============================
 
@@ -291,10 +299,14 @@
  MX4J, please see the MX4J website (http://mx4j.sourceforge.net/).
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for The Independent JPEG Group's JPEG software
 =====================================================
 
@@ -338,10 +350,14 @@
 assumed by the product vendor.
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for Little CMS
 =====================
 
@@ -369,10 +385,14 @@
 OTHER DEALINGS IN THE SOFTWARE.
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for libpng
 =================
 
@@ -416,10 +436,14 @@
 appreciated.
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for Unicode Character Database
 =====================================
 
@@ -456,34 +480,45 @@
 copyright holder. 
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
-Notice for IETF RFC
-===================
 
-Portions of Apache Harmony reference the following RFC specifications:
+
+Notice for IETF RFCs prior to 2005
+==================================
+
+This distribution may contain software that is based in part on the work of
+the following IETF RFCs.  Portions of the IETF RFC specifications may be
+included in source code comments for reference, and in accordance with
+the licensing terms, the licenses are reproduced here:
+
+
 RFC 2313 - PKCS #1: RSA Encryption
+           Copyright (C) The Internet Society (1998).  All Rights Reserved.
+
 RFC 2315 - PKCS #7: Cryptographic Message Syntax
+           Copyright (C) The Internet Society (1998).  All Rights Reserved.
+
 RFC 2781 - UTF-16, an encoding of ISO 10646
+           Copyright (C) The Internet Society (2000).  All Rights Reserved.
+
 RFC 2891 - LDAP Control Extension for Server Side Sorting of Search Results
+           Copyright (C) The Internet Society (2000).  All Rights Reserved.
+
 RFC 2985 - PKCS #9: Selected Object Classes and Attribute Types
-RFC 3161 - Internet X.509 Public Key Infrastructure Time-Stamp Protocol (TSP)
-RFC 3280 - Internet X.509 Public Key Infrastructure, Certificate and
-    Certificate Revocation List (CRL) Profile
+           Copyright (C) The Internet Society (2000).  All Rights Reserved.
 
+RFC 3161 - Internet X.509 Public Key Infrastructure Time-Stamp Protocol (TSP)
+           Copyright (C) The Internet Society (2001).  All Rights Reserved.
 
-Portions of these specifications are included in Harmony Javadoc for reference, and in
-accordance with the licensing terms, the licenses are included here:
+RFC 3280 - Internet X.509 Public Key Infrastructure, Certificate and
+           Certificate Revocation List (CRL) Profile
+           Copyright (C) The Internet Society (2002).  All Rights Reserved.
 
-RFC 2313: Copyright (C) The Internet Society (1998).  All Rights Reserved.
-RFC 2315: Copyright (C) The Internet Society (1998).  All Rights Reserved.
-RFC 2781: Copyright (C) The Internet Society (2000).  All Rights Reserved.
-RFC 2891: Copyright (C) The Internet Society (2000).  All Rights Reserved.
-RFC 2985: Copyright (C) The Internet Society (2000).  All Rights Reserved.
-RFC 3161: Copyright (C) The Internet Society (2001).  All Rights Reserved.
-RFC 3280: Copyright (C) The Internet Society (2002).  All Rights Reserved.
 
 The following statement applies to each RFC:
 
@@ -512,10 +547,44 @@
    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
 
+Notice for IETF RFCs from 2005 onwards
+======================================
+
+This distribution may contain software that is based in part on the work of
+the following IETF RFCs.  Portions of the IETF RFC specifications may be
+included in source code comments for reference, and in accordance with
+the licensing terms, the licenses are reproduced here:
+
+RFC 4122 - A Universally Unique Identifier (UUID) URN Namespace
+           Copyright (C) The Internet Society (2005).
+
+
+The following statement applies to this RFC:
+      
+      Copyright (C) The Internet Society (2005).
+
+      This document is subject to the rights, licenses and restrictions
+      contained in BCP 78, and except as set forth therein, the authors
+      retain all their rights.
+
+      This document and the information contained herein are provided
+      on an "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE
+      REPRESENTS OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND
+      THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT
+      THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR
+      ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
+      PARTICULAR PURPOSE.
+
+
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for RSA Public-Key Cryptography Standards 
 ================================================
 
@@ -530,10 +599,14 @@
 material mentioning or referencing this document.
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for Apache Yoko
 ======================
 
@@ -551,10 +624,14 @@
 http://incubator.apache.org/yoko/
 
 
+
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 Notice for the Eclipse JDT Core Batch Compiler
 ==============================================
 
@@ -570,14 +647,18 @@
 
 
 
+
 ===============================================================================
 ===============================================================================
 
 
+
+
 License notice for the DejaVu fonts package
 ==============================================
 
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below)
 
 Bitstream Vera Fonts Copyright
 ------------------------------

Propchange: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Thu Aug  2 14:27:53 2007
@@ -65,8 +65,8 @@
         <delete file="${hy.jdk}/build/test/${hy.accessibility.packaging.jarname}_tests.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.accessibility.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Thu Aug  2 14:27:53 2007
@@ -60,8 +60,8 @@
         <delete file="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.annotation.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Thu Aug  2 14:27:53 2007
@@ -60,8 +60,8 @@
         <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.applet.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Thu Aug  2 14:27:53 2007
@@ -125,8 +125,8 @@
         <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.archive.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
         <antcall target="clean-native-includes" />
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Thu Aug  2 14:27:53 2007
@@ -94,8 +94,8 @@
         <delete file="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.auth.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Thu Aug  2 14:27:53 2007
@@ -75,8 +75,8 @@
         <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.awt.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/GLXGraphicsConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphics2D.java?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphics2D.java Thu Aug  2 14:27:53 2007
@@ -32,6 +32,7 @@
 import org.apache.harmony.awt.gl.MultiRectArea;
 import org.apache.harmony.awt.gl.Surface;
 import org.apache.harmony.awt.gl.Utils;
+import org.apache.harmony.awt.gl.font.FontManager;
 import org.apache.harmony.awt.gl.font.LinuxNativeFont;
 import org.apache.harmony.awt.wtk.NativeWindow;
 import org.apache.harmony.awt.nativebridge.Int8Pointer;
@@ -82,7 +83,9 @@
         blitter = XBlitter.getInstance();
         Rectangle bounds = clip.getBounds();
         dstSurf = new XSurface(this, bounds.width, bounds.height);
-//        jtr = DrawableTextRenderer.inst;
+        if (!FontManager.IS_FONTLIB) {
+            jtr = DrawableTextRenderer.inst;
+        }
 
         //setTransformedClip(clip);
         setClip(clip);

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/nativebridge/linux/GLX.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java Thu Aug  2 14:27:53 2007
@@ -1,343 +1,343 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
-/**
- * @author Oleg V. Khaschansky
- * @version $Revision$
- */
-
-package org.apache.harmony.awt.gl.windows;
-
-import org.apache.harmony.awt.gl.opengl.OGLContextManager;
-import org.apache.harmony.awt.gl.opengl.GLDefs;
-import org.apache.harmony.awt.gl.opengl.OGLVolatileImage;
-import org.apache.harmony.awt.nativebridge.windows.*;
-import org.apache.harmony.awt.nativebridge.NativeBridge;
-import org.apache.harmony.awt.nativebridge.Int32Pointer;
-import org.apache.harmony.awt.wtk.windows.WindowProcHandler;
-import org.apache.harmony.awt.wtk.windows.WinEventQueue;
-import org.apache.harmony.awt.ContextStorage;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.awt.image.VolatileImage;
-
-public class WGLGraphicsConfiguration
-        extends WinGraphicsConfiguration
-        implements OGLContextManager {
-    private static final Win32 w32 = Win32.getInstance();
-    private static final WGL wgl = WGL.getInstance();
-
-    private static final String WINDOW_CLASS_NAME = "org.apache.harmony.awt.gl.tmpWindow";
-    private static final int FORMATTED_DRAWABLES_CACHE_SIZE = 255;
-
-    private static final ThreadLocal oglContextThreadLocal = new ThreadLocal();
-
-    private static long currentOGLContext;
-    private static long currentDrawable;
-
-    private static final ArrayList existingContexts = new ArrayList();
-    private static final HashSet formattedDrawables = new HashSet(255);
-
-    private static boolean wndClassRegistetred;
-
-    private long hTmpWnd;
-    private long hTmpDC;
-    private long tmpCtx;
-
-    // XXX - todo - maybe we need different pointers for different configurations?
-    //private static boolean resolvedEXT = false; // Are ext funcs resolved?
-
-    private long getLocalOGLContext() {
-        Long ctxId = (Long) oglContextThreadLocal.get();
-        return ctxId == null ? 0 : ctxId.longValue();
-    }
-
-    public WGLGraphicsConfiguration(WinGraphicsDevice device, int index, Win32.PIXELFORMATDESCRIPTOR pfd) {
-        super(device, index, pfd);
-    }
-
-    public WGLGraphicsConfiguration(long hwnd, long hdc) {
-        super(hwnd, hdc);
-    }
-
-    public WGLGraphicsConfiguration(long hdc) {
-        super(hdc);
-    }
-
-    public long windowProc(long hwnd, int msg, long wParam, long lParam) {
-        return w32.DefWindowProcW(hwnd, msg, wParam, lParam);
-    }
-
-    private final long getHWND() {
-        if (!wndClassRegistetred) {
-            WindowProcHandler.registerWindowClass(WINDOW_CLASS_NAME);
-            wndClassRegistetred = true;
-        }
-
-        WinEventQueue.Task task = new WinEventQueue.Task () {
-            public void perform() {
-                returnValue = new Long(w32.CreateWindowExW(
-                        0, WINDOW_CLASS_NAME, "TmpWindow",
-                        0, 0, 0, 0, 0, 0, 0, 0, null
-                ));
-            }
-        };
-
-        WinEventQueue winEventQueue = ((WinEventQueue) ContextStorage.getNativeEventQueue());
-        winEventQueue.performTask(task);
-
-        return ((Long)task.returnValue).longValue();
-    }
-
-    private void activateTmpCtx() {
-        if (hTmpWnd == 0) {
-            hTmpWnd = getHWND();
-            hTmpDC = w32.GetDC(hTmpWnd);
-
-            Win32.PIXELFORMATDESCRIPTOR pfd = w32.createPIXELFORMATDESCRIPTOR(false);
-            pfd.set_nSize((short)pfd.size());
-            pfd.set_nVersion((short)1);
-            pfd.set_dwFlags(WindowsDefs.PFD_DRAW_TO_WINDOW | WindowsDefs.PFD_SUPPORT_OPENGL);
-            pfd.set_iPixelType((byte)WindowsDefs.PFD_TYPE_RGBA);
-            pfd.set_cAlphaBits((byte)8);
-            pfd.set_cStencilBits((byte)1);
-            pfd.set_iLayerType((byte)WindowsDefs.PFD_MAIN_PLANE);
-
-            int pixelFormat = w32.ChoosePixelFormat(hTmpDC, pfd);
-            w32.SetPixelFormat(hTmpDC, pixelFormat, pfd);
-            tmpCtx = wgl.wglCreateContext(hTmpDC);
-        }
-
-        wgl.wglMakeCurrent(hTmpDC, tmpCtx);
-    }
-
-    protected void finalize() throws Throwable {
-        wgl.wglDeleteContext(tmpCtx);
-        w32.ReleaseDC(hTmpWnd, hTmpDC);
-        w32.DestroyWindow(hTmpWnd);
-    }
-
-    private final int choosePixelFormatARB(long hdc) {
-        /*
-        if (!resolvedEXT) {
-            resolveEXT();
-        }
-        */
-        activateTmpCtx();
-
-        Int32Pointer nFormats = NativeBridge.getInstance().createInt32Pointer(1, true);
-        Int32Pointer formatPtr = NativeBridge.getInstance().createInt32Pointer(1, true);
-        Int32Pointer attribList = NativeBridge.getInstance().createInt32Pointer(13, true);
-
-        // Fill in FB config attributes
-        attribList.set(0, WGLDefs.WGL_PIXEL_TYPE_ARB);
-        attribList.set(1, WGLDefs.WGL_TYPE_RGBA_ARB);
-        attribList.set(2, WGLDefs.WGL_DRAW_TO_WINDOW_ARB);
-        attribList.set(3, GLDefs.GL_TRUE);
-        attribList.set(4, WGLDefs.WGL_DRAW_TO_PBUFFER_ARB);
-        attribList.set(5, GLDefs.GL_TRUE);
-        attribList.set(6, WGLDefs.WGL_STENCIL_BITS_ARB);
-        attribList.set(7, 1);
-        attribList.set(8, WGLDefs.WGL_ALPHA_BITS_ARB);
-        attribList.set(9, 8);
-        attribList.set(10, WGLDefs.WGL_ACCELERATION_ARB);
-        attribList.set(11, WGLDefs.WGL_FULL_ACCELERATION_ARB);
-        //attribList.set(12, WGLDefs.WGL_DOUBLE_BUFFER_ARB);
-        //attribList.set(13, GLDefs.GL_TRUE);
-        attribList.set(12, 0);
-
-        wgl.wglChoosePixelFormatARB(hdc, attribList, null, 1, formatPtr, nFormats);
-
-        int res = formatPtr.get(0);
-
-        formatPtr.free();
-        nFormats.free();
-        attribList.free();
-
-        return res;
-    }
-
-    /**
-     * This method calls ext (ARB) functions to resolve its addresses.
-     * For now it calls only one - wglChoosePixelFormatARB
-     */
-    /*
-    private final void resolveEXT() {
-        long hwnd = getHWND();
-        long hdc = w32.GetDC(hwnd);
-
-        Win32.PIXELFORMATDESCRIPTOR pfd = w32.createPIXELFORMATDESCRIPTOR(false);
-        pfd.set_nSize((short)pfd.size());
-        pfd.set_nVersion((short)1);
-        pfd.set_dwFlags(WindowsDefs.PFD_DRAW_TO_WINDOW | WindowsDefs.PFD_SUPPORT_OPENGL);
-        pfd.set_iPixelType((byte)WindowsDefs.PFD_TYPE_RGBA);
-        pfd.set_cColorBits((byte)32);
-        pfd.set_cAlphaBits((byte)8);
-        pfd.set_cStencilBits((byte)1);
-        pfd.set_iLayerType((byte)WindowsDefs.PFD_MAIN_PLANE);
-
-        int pixelFormat = w32.ChoosePixelFormat(hdc, pfd);
-        w32.SetPixelFormat(hdc, pixelFormat, pfd);
-        // XXX - todo - check for success
-        long ctx = wgl.wglCreateContext(hdc);
-        wgl.wglMakeCurrent(hdc, ctx);
-
-        WGL.init(); // Initialize function pointers
-
-        wgl.wglMakeCurrent(0, 0);
-        wgl.wglDeleteContext(ctx);
-
-        w32.ReleaseDC(hwnd, hdc);
-        w32.DestroyWindow(hwnd);
-
-        resolvedEXT = true;
-    }
-    */
-    public long getOGLContext(long drawable, long oshdc) {
-        long oglContext = getLocalOGLContext();
-
-        if (oglContext == 0) {
-            long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
-
-            if (oshdc == 0) {
-                int pixelFormat = choosePixelFormatARB(hdc);
-                w32.SetPixelFormat(hdc, pixelFormat, w32.createPIXELFORMATDESCRIPTOR(false));
-                if (formattedDrawables.size() > FORMATTED_DRAWABLES_CACHE_SIZE) {
-                    formattedDrawables.clear();
-                }
-                formattedDrawables.add(new Long(drawable));
-            }
-
-            oglContext = wgl.wglCreateContext(hdc);
-
-            if(oshdc == 0) {
-                w32.ReleaseDC(drawable, hdc);
-            }
-
-            // Share display lists if there are othe contexts
-            if (existingContexts.size() > 0) {
-                wgl.wglShareLists(((Long)existingContexts.get(0)).longValue(), oglContext);
-            }
-
-            existingContexts.add(new Long(oglContext));
-            oglContextThreadLocal.set(new Long(oglContext));
-        }
-
-        return oglContext;
-    }
-
-    public void destroyOGLContext(long oglContext) {
-        if (oglContext == currentOGLContext) {
-            currentOGLContext = 0;
-        }
-
-        wgl.wglDeleteContext(oglContext);
-        existingContexts.remove(new Long(oglContext));
-    }
-
-    public boolean makeCurrent(long oglContext, long drawable, long oshdc) {
-        if (oglContext != currentOGLContext || drawable != currentDrawable) {
-
-            long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
-
-            if (oshdc == 0 && !formattedDrawables.contains(new Long(drawable))) { // Need to set pixel format
-                int pixelFormat = choosePixelFormatARB(hdc);
-                w32.SetPixelFormat(hdc, pixelFormat, w32.createPIXELFORMATDESCRIPTOR(false));
-                if (formattedDrawables.size() > FORMATTED_DRAWABLES_CACHE_SIZE) {
-                    formattedDrawables.clear();
-                }
-                formattedDrawables.add(new Long(drawable));
-            }
-
-            if (wgl.wglMakeCurrent(hdc, oglContext) == 0) {
-                w32.ReleaseDC(drawable, hdc);
-                throw new IllegalStateException("Cannot make opengl context current");
-            }
-
-            if(oshdc == 0) {
-                w32.ReleaseDC(drawable, hdc);
-            }
-
-            currentOGLContext = oglContext;
-            currentDrawable = drawable;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public boolean makeContextCurrent(
-            long oglContext,
-            long draw, long read,
-            long drawHDC, long readHDC
-    ) {
-        return makeCurrent(oglContext, draw, drawHDC); // XXX - todo - implement
-    }
-
-    public void swapBuffers(long drawable, long oshdc) {
-        long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
-        wgl.SwapBuffers(hdc);
-        if(oshdc == 0) {
-            w32.ReleaseDC(drawable, hdc);
-        }
-    }
-
-    public OffscreenBufferObject createOffscreenBuffer(int w, int h) {
-        // Try to get pbuffer from cache
-        OffscreenBufferObject pbuffer = OffscreenBufferObject.getCachedBuffer(w, h, this);
-        if (pbuffer != null) {
-            return pbuffer;
-        }
-
-        long hwnd = getHWND();
-        long hdc = w32.GetDC(hwnd);
-
-        int pixelFormat = choosePixelFormatARB(hdc);
-
-        Int32Pointer attribList = NativeBridge.getInstance().createInt32Pointer(1, true);
-        attribList.set(0,0);
-        long id = wgl.wglCreatePbufferARB(hdc, pixelFormat, w, h, attribList.lock());
-        attribList.unlock();
-        attribList.free();
-
-        long buffHdc = wgl.wglGetPbufferDCARB(id);
-
-        w32.ReleaseDC(hwnd, hdc);
-        w32.DestroyWindow(hwnd);
-
-        return new OffscreenBufferObject(id, buffHdc, w, h, this);
-    }
-
-    public void freeOffscreenBuffer(OffscreenBufferObject pbuffer) {
-        pbuffer = OffscreenBufferObject.freeCachedBuffer(pbuffer);
-
-        if (pbuffer != null) {
-            wgl.wglReleasePbufferDCARB(pbuffer.id, pbuffer.hdc);
-            wgl.wglDestroyPbufferARB(pbuffer.id);
-        }
-    }
-
-    public void freeOffscreenBuffer(long id, long hdc) {
-        wgl.wglReleasePbufferDCARB(id, hdc);
-        wgl.wglDestroyPbufferARB(id);
-    }
-
-    public VolatileImage createCompatibleVolatileImage(int width, int height) {
-        return new OGLVolatileImage(this, width, height);
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+/**
+ * @author Oleg V. Khaschansky
+ * @version $Revision$
+ */
+
+package org.apache.harmony.awt.gl.windows;
+
+import org.apache.harmony.awt.gl.opengl.OGLContextManager;
+import org.apache.harmony.awt.gl.opengl.GLDefs;
+import org.apache.harmony.awt.gl.opengl.OGLVolatileImage;
+import org.apache.harmony.awt.nativebridge.windows.*;
+import org.apache.harmony.awt.nativebridge.NativeBridge;
+import org.apache.harmony.awt.nativebridge.Int32Pointer;
+import org.apache.harmony.awt.wtk.windows.WindowProcHandler;
+import org.apache.harmony.awt.wtk.windows.WinEventQueue;
+import org.apache.harmony.awt.ContextStorage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.awt.image.VolatileImage;
+
+public class WGLGraphicsConfiguration
+        extends WinGraphicsConfiguration
+        implements OGLContextManager {
+    private static final Win32 w32 = Win32.getInstance();
+    private static final WGL wgl = WGL.getInstance();
+
+    private static final String WINDOW_CLASS_NAME = "org.apache.harmony.awt.gl.tmpWindow";
+    private static final int FORMATTED_DRAWABLES_CACHE_SIZE = 255;
+
+    private static final ThreadLocal oglContextThreadLocal = new ThreadLocal();
+
+    private static long currentOGLContext;
+    private static long currentDrawable;
+
+    private static final ArrayList existingContexts = new ArrayList();
+    private static final HashSet formattedDrawables = new HashSet(255);
+
+    private static boolean wndClassRegistetred;
+
+    private long hTmpWnd;
+    private long hTmpDC;
+    private long tmpCtx;
+
+    // XXX - todo - maybe we need different pointers for different configurations?
+    //private static boolean resolvedEXT = false; // Are ext funcs resolved?
+
+    private long getLocalOGLContext() {
+        Long ctxId = (Long) oglContextThreadLocal.get();
+        return ctxId == null ? 0 : ctxId.longValue();
+    }
+
+    public WGLGraphicsConfiguration(WinGraphicsDevice device, int index, Win32.PIXELFORMATDESCRIPTOR pfd) {
+        super(device, index, pfd);
+    }
+
+    public WGLGraphicsConfiguration(long hwnd, long hdc) {
+        super(hwnd, hdc);
+    }
+
+    public WGLGraphicsConfiguration(long hdc) {
+        super(hdc);
+    }
+
+    public long windowProc(long hwnd, int msg, long wParam, long lParam) {
+        return w32.DefWindowProcW(hwnd, msg, wParam, lParam);
+    }
+
+    private final long getHWND() {
+        if (!wndClassRegistetred) {
+            WindowProcHandler.registerWindowClass(WINDOW_CLASS_NAME);
+            wndClassRegistetred = true;
+        }
+
+        WinEventQueue.Task task = new WinEventQueue.Task () {
+            public void perform() {
+                returnValue = new Long(w32.CreateWindowExW(
+                        0, WINDOW_CLASS_NAME, "TmpWindow",
+                        0, 0, 0, 0, 0, 0, 0, 0, null
+                ));
+            }
+        };
+
+        WinEventQueue winEventQueue = ((WinEventQueue) ContextStorage.getNativeEventQueue());
+        winEventQueue.performTask(task);
+
+        return ((Long)task.returnValue).longValue();
+    }
+
+    private void activateTmpCtx() {
+        if (hTmpWnd == 0) {
+            hTmpWnd = getHWND();
+            hTmpDC = w32.GetDC(hTmpWnd);
+
+            Win32.PIXELFORMATDESCRIPTOR pfd = w32.createPIXELFORMATDESCRIPTOR(false);
+            pfd.set_nSize((short)pfd.size());
+            pfd.set_nVersion((short)1);
+            pfd.set_dwFlags(WindowsDefs.PFD_DRAW_TO_WINDOW | WindowsDefs.PFD_SUPPORT_OPENGL);
+            pfd.set_iPixelType((byte)WindowsDefs.PFD_TYPE_RGBA);
+            pfd.set_cAlphaBits((byte)8);
+            pfd.set_cStencilBits((byte)1);
+            pfd.set_iLayerType((byte)WindowsDefs.PFD_MAIN_PLANE);
+
+            int pixelFormat = w32.ChoosePixelFormat(hTmpDC, pfd);
+            w32.SetPixelFormat(hTmpDC, pixelFormat, pfd);
+            tmpCtx = wgl.wglCreateContext(hTmpDC);
+        }
+
+        wgl.wglMakeCurrent(hTmpDC, tmpCtx);
+    }
+
+    protected void finalize() throws Throwable {
+        wgl.wglDeleteContext(tmpCtx);
+        w32.ReleaseDC(hTmpWnd, hTmpDC);
+        w32.DestroyWindow(hTmpWnd);
+    }
+
+    private final int choosePixelFormatARB(long hdc) {
+        /*
+        if (!resolvedEXT) {
+            resolveEXT();
+        }
+        */
+        activateTmpCtx();
+
+        Int32Pointer nFormats = NativeBridge.getInstance().createInt32Pointer(1, true);
+        Int32Pointer formatPtr = NativeBridge.getInstance().createInt32Pointer(1, true);
+        Int32Pointer attribList = NativeBridge.getInstance().createInt32Pointer(13, true);
+
+        // Fill in FB config attributes
+        attribList.set(0, WGLDefs.WGL_PIXEL_TYPE_ARB);
+        attribList.set(1, WGLDefs.WGL_TYPE_RGBA_ARB);
+        attribList.set(2, WGLDefs.WGL_DRAW_TO_WINDOW_ARB);
+        attribList.set(3, GLDefs.GL_TRUE);
+        attribList.set(4, WGLDefs.WGL_DRAW_TO_PBUFFER_ARB);
+        attribList.set(5, GLDefs.GL_TRUE);
+        attribList.set(6, WGLDefs.WGL_STENCIL_BITS_ARB);
+        attribList.set(7, 1);
+        attribList.set(8, WGLDefs.WGL_ALPHA_BITS_ARB);
+        attribList.set(9, 8);
+        attribList.set(10, WGLDefs.WGL_ACCELERATION_ARB);
+        attribList.set(11, WGLDefs.WGL_FULL_ACCELERATION_ARB);
+        //attribList.set(12, WGLDefs.WGL_DOUBLE_BUFFER_ARB);
+        //attribList.set(13, GLDefs.GL_TRUE);
+        attribList.set(12, 0);
+
+        wgl.wglChoosePixelFormatARB(hdc, attribList, null, 1, formatPtr, nFormats);
+
+        int res = formatPtr.get(0);
+
+        formatPtr.free();
+        nFormats.free();
+        attribList.free();
+
+        return res;
+    }
+
+    /**
+     * This method calls ext (ARB) functions to resolve its addresses.
+     * For now it calls only one - wglChoosePixelFormatARB
+     */
+    /*
+    private final void resolveEXT() {
+        long hwnd = getHWND();
+        long hdc = w32.GetDC(hwnd);
+
+        Win32.PIXELFORMATDESCRIPTOR pfd = w32.createPIXELFORMATDESCRIPTOR(false);
+        pfd.set_nSize((short)pfd.size());
+        pfd.set_nVersion((short)1);
+        pfd.set_dwFlags(WindowsDefs.PFD_DRAW_TO_WINDOW | WindowsDefs.PFD_SUPPORT_OPENGL);
+        pfd.set_iPixelType((byte)WindowsDefs.PFD_TYPE_RGBA);
+        pfd.set_cColorBits((byte)32);
+        pfd.set_cAlphaBits((byte)8);
+        pfd.set_cStencilBits((byte)1);
+        pfd.set_iLayerType((byte)WindowsDefs.PFD_MAIN_PLANE);
+
+        int pixelFormat = w32.ChoosePixelFormat(hdc, pfd);
+        w32.SetPixelFormat(hdc, pixelFormat, pfd);
+        // XXX - todo - check for success
+        long ctx = wgl.wglCreateContext(hdc);
+        wgl.wglMakeCurrent(hdc, ctx);
+
+        WGL.init(); // Initialize function pointers
+
+        wgl.wglMakeCurrent(0, 0);
+        wgl.wglDeleteContext(ctx);
+
+        w32.ReleaseDC(hwnd, hdc);
+        w32.DestroyWindow(hwnd);
+
+        resolvedEXT = true;
+    }
+    */
+    public long getOGLContext(long drawable, long oshdc) {
+        long oglContext = getLocalOGLContext();
+
+        if (oglContext == 0) {
+            long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
+
+            if (oshdc == 0) {
+                int pixelFormat = choosePixelFormatARB(hdc);
+                w32.SetPixelFormat(hdc, pixelFormat, w32.createPIXELFORMATDESCRIPTOR(false));
+                if (formattedDrawables.size() > FORMATTED_DRAWABLES_CACHE_SIZE) {
+                    formattedDrawables.clear();
+                }
+                formattedDrawables.add(new Long(drawable));
+            }
+
+            oglContext = wgl.wglCreateContext(hdc);
+
+            if(oshdc == 0) {
+                w32.ReleaseDC(drawable, hdc);
+            }
+
+            // Share display lists if there are othe contexts
+            if (existingContexts.size() > 0) {
+                wgl.wglShareLists(((Long)existingContexts.get(0)).longValue(), oglContext);
+            }
+
+            existingContexts.add(new Long(oglContext));
+            oglContextThreadLocal.set(new Long(oglContext));
+        }
+
+        return oglContext;
+    }
+
+    public void destroyOGLContext(long oglContext) {
+        if (oglContext == currentOGLContext) {
+            currentOGLContext = 0;
+        }
+
+        wgl.wglDeleteContext(oglContext);
+        existingContexts.remove(new Long(oglContext));
+    }
+
+    public boolean makeCurrent(long oglContext, long drawable, long oshdc) {
+        if (oglContext != currentOGLContext || drawable != currentDrawable) {
+
+            long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
+
+            if (oshdc == 0 && !formattedDrawables.contains(new Long(drawable))) { // Need to set pixel format
+                int pixelFormat = choosePixelFormatARB(hdc);
+                w32.SetPixelFormat(hdc, pixelFormat, w32.createPIXELFORMATDESCRIPTOR(false));
+                if (formattedDrawables.size() > FORMATTED_DRAWABLES_CACHE_SIZE) {
+                    formattedDrawables.clear();
+                }
+                formattedDrawables.add(new Long(drawable));
+            }
+
+            if (wgl.wglMakeCurrent(hdc, oglContext) == 0) {
+                w32.ReleaseDC(drawable, hdc);
+                throw new IllegalStateException("Cannot make opengl context current");
+            }
+
+            if(oshdc == 0) {
+                w32.ReleaseDC(drawable, hdc);
+            }
+
+            currentOGLContext = oglContext;
+            currentDrawable = drawable;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean makeContextCurrent(
+            long oglContext,
+            long draw, long read,
+            long drawHDC, long readHDC
+    ) {
+        return makeCurrent(oglContext, draw, drawHDC); // XXX - todo - implement
+    }
+
+    public void swapBuffers(long drawable, long oshdc) {
+        long hdc = (oshdc == 0) ? w32.GetDC(drawable) : oshdc;
+        wgl.SwapBuffers(hdc);
+        if(oshdc == 0) {
+            w32.ReleaseDC(drawable, hdc);
+        }
+    }
+
+    public OffscreenBufferObject createOffscreenBuffer(int w, int h) {
+        // Try to get pbuffer from cache
+        OffscreenBufferObject pbuffer = OffscreenBufferObject.getCachedBuffer(w, h, this);
+        if (pbuffer != null) {
+            return pbuffer;
+        }
+
+        long hwnd = getHWND();
+        long hdc = w32.GetDC(hwnd);
+
+        int pixelFormat = choosePixelFormatARB(hdc);
+
+        Int32Pointer attribList = NativeBridge.getInstance().createInt32Pointer(1, true);
+        attribList.set(0,0);
+        long id = wgl.wglCreatePbufferARB(hdc, pixelFormat, w, h, attribList.lock());
+        attribList.unlock();
+        attribList.free();
+
+        long buffHdc = wgl.wglGetPbufferDCARB(id);
+
+        w32.ReleaseDC(hwnd, hdc);
+        w32.DestroyWindow(hwnd);
+
+        return new OffscreenBufferObject(id, buffHdc, w, h, this);
+    }
+
+    public void freeOffscreenBuffer(OffscreenBufferObject pbuffer) {
+        pbuffer = OffscreenBufferObject.freeCachedBuffer(pbuffer);
+
+        if (pbuffer != null) {
+            wgl.wglReleasePbufferDCARB(pbuffer.id, pbuffer.hdc);
+            wgl.wglDestroyPbufferARB(pbuffer.id);
+        }
+    }
+
+    public void freeOffscreenBuffer(long id, long hdc) {
+        wgl.wglReleasePbufferDCARB(id, hdc);
+        wgl.wglDestroyPbufferARB(id);
+    }
+
+    public VolatileImage createCompatibleVolatileImage(int width, int height) {
+        return new OGLVolatileImage(this, width, height);
+    }
+}

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java Thu Aug  2 14:27:53 2007
@@ -1,256 +1,256 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
-/**
- * @author Oleg V. Khaschansky
- * @version $Revision$
- */
-/**
- * This file is based on WGL headers and has been generated by the nativebridge tool.
- */
-
-package org.apache.harmony.awt.nativebridge.windows;
-
-import org.apache.harmony.awt.nativebridge.*;
-
-/**
- * This file is based on WGL headers and has been generated by the nativebridge tool.
- */
-public class WGL extends BasicLibWrapper {
-    static WGL instance;
-
-    public static synchronized WGL getInstance() {
-        if (instance == null) {
-            instance = new WGL();
-        }
-        return instance;
-    }
-
-    private WGL() {
-        System.loadLibrary("Win32Wrapper");
-        init();
-    }
-
-    private static native void init();
-
-    public final long wglGetProcAddress(String param_0) {
-        Int8Pointer _param_0 = null == param_0? null :  nb.createInt8Pointer(param_0, false);
-        long tmp_0 = _param_0 == null ? 0 : _param_0.longLockPointer();
-        long tmp_ret = wglGetProcAddress(tmp_0);
-        if (_param_0 != null) {
-            _param_0.unlock();
-            _param_0.free();
-        }
-        return tmp_ret;
-    }
-    public final long wglGetProcAddress(Int8Pointer param_0) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        long tmp_ret = wglGetProcAddress(tmp_0);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native long wglGetProcAddress(long param_0);
-
-    public final native long wglCreateContext(long param_0);
-
-
-    public static class HGLRC__ extends CommonStructWrapper {
-
-        public static final int sizeof = 4;
-
-        HGLRC__(boolean direct) {
-            super(sizeof, direct);
-        }
-        HGLRC__(VoidPointer base) {
-            super(base);
-        }
-        HGLRC__(long addr) {
-            super(addr);
-        }
-        public final void set_unused(int val) {
-            byteBase.setInt32(0, val);
-        }
-        public final int get_unused() {
-            return byteBase.getInt32(0);
-        }
-        public int size() {
-            return sizeof;
-        }
-    }
-
-    public final HGLRC__ createHGLRC__(boolean direct) {
-        return new HGLRC__(direct);
-    }
-    public final HGLRC__ createHGLRC__(VoidPointer base) {
-        return new HGLRC__(base);
-    }
-    public final HGLRC__ createHGLRC__(long addr) {
-        return new HGLRC__(addr);
-    }
-
-    public final int wglMakeCurrent(long param_0, WGL.HGLRC__ param_1) {
-        long tmp_0 = param_1 == null ? 0 : param_1.longLockPointer();
-        int tmp_ret = wglMakeCurrent(param_0, tmp_0);
-        if (param_1 != null) {
-            param_1.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglMakeCurrent(long param_0, long param_1);
-
-    public final int wglDestroyPbufferARB(HPBUFFERARB__ param_0) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        int tmp_ret = wglDestroyPbufferARB(tmp_0);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglDestroyPbufferARB(long param_0);
-
-
-    public static class HPBUFFERARB__ extends CommonStructWrapper {
-
-        public static final int sizeof = 4;
-
-        HPBUFFERARB__(boolean direct) {
-            super(sizeof, direct);
-        }
-        HPBUFFERARB__(VoidPointer base) {
-            super(base);
-        }
-        HPBUFFERARB__(long addr) {
-            super(addr);
-        }
-        public final void set_unused(int val) {
-            byteBase.setInt32(0, val);
-        }
-        public final int get_unused() {
-            return byteBase.getInt32(0);
-        }
-        public int size() {
-            return sizeof;
-        }
-    }
-
-    public final HPBUFFERARB__ createHPBUFFERARB__(boolean direct) {
-        return new HPBUFFERARB__(direct);
-    }
-    public final HPBUFFERARB__ createHPBUFFERARB__(VoidPointer base) {
-        return new HPBUFFERARB__(base);
-    }
-    public final HPBUFFERARB__ createHPBUFFERARB__(long addr) {
-        return new HPBUFFERARB__(addr);
-    }
-
-    public final native int SwapBuffers(long param_0);
-
-    public final int wglReleasePbufferDCARB(WGL.HPBUFFERARB__ param_0, long param_1) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        int tmp_ret = wglReleasePbufferDCARB(tmp_0, param_1);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglReleasePbufferDCARB(long param_0, long param_1);
-
-    public final WGL.HPBUFFERARB__ wglCreatePbufferARB(long param_0, int param_1, int param_2, int param_3, Int32Pointer param_4) {
-        long tmp_0 = param_4 == null ? 0 : param_4.longLockPointer();
-        long tmp_ret = wglCreatePbufferARB(param_0, param_1, param_2, param_3, tmp_0);
-        if (param_4 != null) {
-            param_4.unlock();
-        }
-        return WGL.instance.createHPBUFFERARB__(tmp_ret);
-    }
-    public final native long wglCreatePbufferARB(long param_0, int param_1, int param_2, int param_3, long param_4);
-
-    public final int wglQueryPbufferARB(WGL.HPBUFFERARB__ param_0, int param_1, Int32Pointer param_2) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        long tmp_1 = param_2 == null ? 0 : param_2.longLockPointer();
-        int tmp_ret = wglQueryPbufferARB(tmp_0, param_1, tmp_1);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        if (param_2 != null) {
-            param_2.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglQueryPbufferARB(long param_0, int param_1, long param_2);
-
-    public final int wglDeleteContext(WGL.HGLRC__ param_0) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        int tmp_ret = wglDeleteContext(tmp_0);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglDeleteContext(long param_0);
-
-    public final native long wglGetExtensionsStringARB(long param_0);
-
-    public final int wglChoosePixelFormatARB(long param_0, Int32Pointer param_1, FloatPointer param_2, int param_3, Int32Pointer param_4, Int32Pointer param_5) {
-        long tmp_0 = param_1 == null ? 0 : param_1.longLockPointer();
-        long tmp_1 = param_2 == null ? 0 : param_2.longLockPointer();
-        long tmp_2 = param_4 == null ? 0 : param_4.longLockPointer();
-        long tmp_3 = param_5 == null ? 0 : param_5.longLockPointer();
-        int tmp_ret = wglChoosePixelFormatARB(param_0, tmp_0, tmp_1, param_3, tmp_2, tmp_3);
-        if (param_1 != null) {
-            param_1.unlock();
-        }
-        if (param_2 != null) {
-            param_2.unlock();
-        }
-        if (param_4 != null) {
-            param_4.unlock();
-        }
-        if (param_5 != null) {
-            param_5.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglChoosePixelFormatARB(long param_0, long param_1, long param_2, int param_3, long param_4, long param_5);
-
-    public final int wglShareLists(WGL.HGLRC__ param_0, WGL.HGLRC__ param_1) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        long tmp_1 = param_1 == null ? 0 : param_1.longLockPointer();
-        int tmp_ret = wglShareLists(tmp_0, tmp_1);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        if (param_1 != null) {
-            param_1.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native int wglShareLists(long param_0, long param_1);
-
-    public final long wglGetPbufferDCARB(WGL.HPBUFFERARB__ param_0) {
-        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
-        long tmp_ret = wglGetPbufferDCARB(tmp_0);
-        if (param_0 != null) {
-            param_0.unlock();
-        }
-        return tmp_ret;
-    }
-    public final native long wglGetPbufferDCARB(long param_0);
-
-}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+/**
+ * @author Oleg V. Khaschansky
+ * @version $Revision$
+ */
+/**
+ * This file is based on WGL headers and has been generated by the nativebridge tool.
+ */
+
+package org.apache.harmony.awt.nativebridge.windows;
+
+import org.apache.harmony.awt.nativebridge.*;
+
+/**
+ * This file is based on WGL headers and has been generated by the nativebridge tool.
+ */
+public class WGL extends BasicLibWrapper {
+    static WGL instance;
+
+    public static synchronized WGL getInstance() {
+        if (instance == null) {
+            instance = new WGL();
+        }
+        return instance;
+    }
+
+    private WGL() {
+        System.loadLibrary("Win32Wrapper");
+        init();
+    }
+
+    private static native void init();
+
+    public final long wglGetProcAddress(String param_0) {
+        Int8Pointer _param_0 = null == param_0? null :  nb.createInt8Pointer(param_0, false);
+        long tmp_0 = _param_0 == null ? 0 : _param_0.longLockPointer();
+        long tmp_ret = wglGetProcAddress(tmp_0);
+        if (_param_0 != null) {
+            _param_0.unlock();
+            _param_0.free();
+        }
+        return tmp_ret;
+    }
+    public final long wglGetProcAddress(Int8Pointer param_0) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        long tmp_ret = wglGetProcAddress(tmp_0);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native long wglGetProcAddress(long param_0);
+
+    public final native long wglCreateContext(long param_0);
+
+
+    public static class HGLRC__ extends CommonStructWrapper {
+
+        public static final int sizeof = 4;
+
+        HGLRC__(boolean direct) {
+            super(sizeof, direct);
+        }
+        HGLRC__(VoidPointer base) {
+            super(base);
+        }
+        HGLRC__(long addr) {
+            super(addr);
+        }
+        public final void set_unused(int val) {
+            byteBase.setInt32(0, val);
+        }
+        public final int get_unused() {
+            return byteBase.getInt32(0);
+        }
+        public int size() {
+            return sizeof;
+        }
+    }
+
+    public final HGLRC__ createHGLRC__(boolean direct) {
+        return new HGLRC__(direct);
+    }
+    public final HGLRC__ createHGLRC__(VoidPointer base) {
+        return new HGLRC__(base);
+    }
+    public final HGLRC__ createHGLRC__(long addr) {
+        return new HGLRC__(addr);
+    }
+
+    public final int wglMakeCurrent(long param_0, WGL.HGLRC__ param_1) {
+        long tmp_0 = param_1 == null ? 0 : param_1.longLockPointer();
+        int tmp_ret = wglMakeCurrent(param_0, tmp_0);
+        if (param_1 != null) {
+            param_1.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglMakeCurrent(long param_0, long param_1);
+
+    public final int wglDestroyPbufferARB(HPBUFFERARB__ param_0) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        int tmp_ret = wglDestroyPbufferARB(tmp_0);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglDestroyPbufferARB(long param_0);
+
+
+    public static class HPBUFFERARB__ extends CommonStructWrapper {
+
+        public static final int sizeof = 4;
+
+        HPBUFFERARB__(boolean direct) {
+            super(sizeof, direct);
+        }
+        HPBUFFERARB__(VoidPointer base) {
+            super(base);
+        }
+        HPBUFFERARB__(long addr) {
+            super(addr);
+        }
+        public final void set_unused(int val) {
+            byteBase.setInt32(0, val);
+        }
+        public final int get_unused() {
+            return byteBase.getInt32(0);
+        }
+        public int size() {
+            return sizeof;
+        }
+    }
+
+    public final HPBUFFERARB__ createHPBUFFERARB__(boolean direct) {
+        return new HPBUFFERARB__(direct);
+    }
+    public final HPBUFFERARB__ createHPBUFFERARB__(VoidPointer base) {
+        return new HPBUFFERARB__(base);
+    }
+    public final HPBUFFERARB__ createHPBUFFERARB__(long addr) {
+        return new HPBUFFERARB__(addr);
+    }
+
+    public final native int SwapBuffers(long param_0);
+
+    public final int wglReleasePbufferDCARB(WGL.HPBUFFERARB__ param_0, long param_1) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        int tmp_ret = wglReleasePbufferDCARB(tmp_0, param_1);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglReleasePbufferDCARB(long param_0, long param_1);
+
+    public final WGL.HPBUFFERARB__ wglCreatePbufferARB(long param_0, int param_1, int param_2, int param_3, Int32Pointer param_4) {
+        long tmp_0 = param_4 == null ? 0 : param_4.longLockPointer();
+        long tmp_ret = wglCreatePbufferARB(param_0, param_1, param_2, param_3, tmp_0);
+        if (param_4 != null) {
+            param_4.unlock();
+        }
+        return WGL.instance.createHPBUFFERARB__(tmp_ret);
+    }
+    public final native long wglCreatePbufferARB(long param_0, int param_1, int param_2, int param_3, long param_4);
+
+    public final int wglQueryPbufferARB(WGL.HPBUFFERARB__ param_0, int param_1, Int32Pointer param_2) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        long tmp_1 = param_2 == null ? 0 : param_2.longLockPointer();
+        int tmp_ret = wglQueryPbufferARB(tmp_0, param_1, tmp_1);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        if (param_2 != null) {
+            param_2.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglQueryPbufferARB(long param_0, int param_1, long param_2);
+
+    public final int wglDeleteContext(WGL.HGLRC__ param_0) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        int tmp_ret = wglDeleteContext(tmp_0);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglDeleteContext(long param_0);
+
+    public final native long wglGetExtensionsStringARB(long param_0);
+
+    public final int wglChoosePixelFormatARB(long param_0, Int32Pointer param_1, FloatPointer param_2, int param_3, Int32Pointer param_4, Int32Pointer param_5) {
+        long tmp_0 = param_1 == null ? 0 : param_1.longLockPointer();
+        long tmp_1 = param_2 == null ? 0 : param_2.longLockPointer();
+        long tmp_2 = param_4 == null ? 0 : param_4.longLockPointer();
+        long tmp_3 = param_5 == null ? 0 : param_5.longLockPointer();
+        int tmp_ret = wglChoosePixelFormatARB(param_0, tmp_0, tmp_1, param_3, tmp_2, tmp_3);
+        if (param_1 != null) {
+            param_1.unlock();
+        }
+        if (param_2 != null) {
+            param_2.unlock();
+        }
+        if (param_4 != null) {
+            param_4.unlock();
+        }
+        if (param_5 != null) {
+            param_5.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglChoosePixelFormatARB(long param_0, long param_1, long param_2, int param_3, long param_4, long param_5);
+
+    public final int wglShareLists(WGL.HGLRC__ param_0, WGL.HGLRC__ param_1) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        long tmp_1 = param_1 == null ? 0 : param_1.longLockPointer();
+        int tmp_ret = wglShareLists(tmp_0, tmp_1);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        if (param_1 != null) {
+            param_1.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native int wglShareLists(long param_0, long param_1);
+
+    public final long wglGetPbufferDCARB(WGL.HPBUFFERARB__ param_0) {
+        long tmp_0 = param_0 == null ? 0 : param_0.longLockPointer();
+        long tmp_ret = wglGetPbufferDCARB(tmp_0);
+        if (param_0 != null) {
+            param_0.unlock();
+        }
+        return tmp_ret;
+    }
+    public final native long wglGetPbufferDCARB(long param_0);
+
+}
+

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java Thu Aug  2 14:27:53 2007
@@ -1,37 +1,37 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
-/**
- * @author Oleg V. Khaschansky
- * @version $Revision$
- */
-/**
- * This file is based on WGL headers.
- */
-
-package org.apache.harmony.awt.nativebridge.windows;
-
-public interface WGLDefs {
-    public static final int WGL_DRAW_TO_WINDOW_ARB         = 0x2001;
-    public static final int WGL_PIXEL_TYPE_ARB             = 0x2013;
-    public static final int WGL_TYPE_RGBA_ARB              = 0x202B;
-    public static final int WGL_DRAW_TO_PBUFFER_ARB        = 0x202D;
-    public static final int WGL_STENCIL_BITS_ARB           = 0x2023;
-    public static final int WGL_ALPHA_BITS_ARB             = 0x201B;
-    public static final int WGL_DOUBLE_BUFFER_ARB          = 0x2011;
-    public static final int WGL_ACCELERATION_ARB           = 0x2003;
-    public static final int WGL_FULL_ACCELERATION_ARB      = 0x2027;
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+/**
+ * @author Oleg V. Khaschansky
+ * @version $Revision$
+ */
+/**
+ * This file is based on WGL headers.
+ */
+
+package org.apache.harmony.awt.nativebridge.windows;
+
+public interface WGLDefs {
+    public static final int WGL_DRAW_TO_WINDOW_ARB         = 0x2001;
+    public static final int WGL_PIXEL_TYPE_ARB             = 0x2013;
+    public static final int WGL_TYPE_RGBA_ARB              = 0x202B;
+    public static final int WGL_DRAW_TO_PBUFFER_ARB        = 0x202D;
+    public static final int WGL_STENCIL_BITS_ARB           = 0x2023;
+    public static final int WGL_ALPHA_BITS_ARB             = 0x201B;
+    public static final int WGL_DOUBLE_BUFFER_ARB          = 0x2011;
+    public static final int WGL_ACCELERATION_ARB           = 0x2003;
+    public static final int WGL_FULL_ACCELERATION_ARB      = 0x2027;
+}

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WGLDefs.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/nativelib_common.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h Thu Aug  2 14:27:53 2007
@@ -1,59 +1,59 @@
-/*
- *  Copyright 2005 - 2006 The Apache Software 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.
- */
-/* DO NOT EDIT THIS FILE - it is based on WGL headers and has been generated by nativebridge tool.*/
-
-#include <jni.h>
+/*
+ *  Copyright 2005 - 2006 The Apache Software 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.
+ */
+/* DO NOT EDIT THIS FILE - it is based on WGL headers and has been generated by nativebridge tool.*/
+
+#include <jni.h>
 #include "nativelib_common.h"
-
-#ifndef _Included_org_apache_harmony_awt_nativebridge_windows_WGL
-#define _Included_org_apache_harmony_awt_nativebridge_windows_WGL
-
-#ifdef __cplusplus
-extern "C" {
+
+#ifndef _Included_org_apache_harmony_awt_nativebridge_windows_WGL
+#define _Included_org_apache_harmony_awt_nativebridge_windows_WGL
+
+#ifdef __cplusplus
+extern "C" {
 #endif
-
+
 JNIEXPORT void JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_init (JNIEnv *, jclass);
-
-
-JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetProcAddress(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglCreateContext(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglMakeCurrent(JNIEnv *, jobject, jlong, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglDestroyPbufferARB(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_SwapBuffers(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglReleasePbufferDCARB(JNIEnv *, jobject, jlong, jlong);
-
-JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglCreatePbufferARB(JNIEnv *, jobject, jlong, jint, jint, jint, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglQueryPbufferARB(JNIEnv *, jobject, jlong, jint, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglDeleteContext(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetExtensionsStringARB(JNIEnv *, jobject, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglChoosePixelFormatARB(JNIEnv *, jobject, jlong, jlong, jlong, jint, jlong, jlong);
-
-JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglShareLists(JNIEnv *, jobject, jlong, jlong);
-
-JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetPbufferDCARB(JNIEnv *, jobject, jlong);
-#ifdef __cplusplus
-}
-#endif
-#endif
+
+
+JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetProcAddress(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglCreateContext(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglMakeCurrent(JNIEnv *, jobject, jlong, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglDestroyPbufferARB(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_SwapBuffers(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglReleasePbufferDCARB(JNIEnv *, jobject, jlong, jlong);
+
+JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglCreatePbufferARB(JNIEnv *, jobject, jlong, jint, jint, jint, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglQueryPbufferARB(JNIEnv *, jobject, jlong, jint, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglDeleteContext(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetExtensionsStringARB(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglChoosePixelFormatARB(JNIEnv *, jobject, jlong, jlong, jlong, jint, jlong, jlong);
+
+JNIEXPORT jint  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglShareLists(JNIEnv *, jobject, jlong, jlong);
+
+JNIEXPORT jlong  JNICALL Java_org_apache_harmony_awt_nativebridge_windows_WGL_wglGetPbufferDCARB(JNIEnv *, jobject, jlong);
+#ifdef __cplusplus
+}
+#endif
+#endif

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/org/apache/harmony/awt/AWTPermissionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/build.xml?view=diff&rev=562262&r1=562261&r2=562262
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/build.xml Thu Aug  2 14:27:53 2007
@@ -62,8 +62,8 @@
         <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
-            <fileset dir="${hy.beans.bin.test}" />
         </delete>
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">



Mime
View raw message