/hg/icedtea6: 2 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Wed May 11 07:24:20 PDT 2011
changeset e32979d54978 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e32979d54978
author: aph
date: Mon May 09 17:14:05 2011 +0100
Add icedtea-hugepage patches.
2011-05-09 Andrew Haley <aph at redhat.com>
* Makefile (ICEDTEA_PATCHES): Add icedtea-
hugepage-7034464.patch, patches/icedtea-
hugepage-7037939.patch
* patches/icedtea-hugepage-7034464.patch: Support transparent huge
pages on Linux available since 2.6.38
* patches/icedtea-hugepage-7037939.patch: Disable adaptive
resizing if SHM large pages are used.
* NEWS: Add S7037939, S7034464.
changeset bfbacc38e2ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bfbacc38e2ca
author: aph
date: Wed May 11 15:23:27 2011 +0100
merge
diffstat:
ChangeLog | 45 +
Makefile.am | 8 +-
NEWS | 2 +
generated/java/lang/CharacterData00.java | 12 +-
generated/java/lang/CharacterData01.java | 12 +-
generated/java/lang/CharacterData02.java | 12 +-
generated/java/lang/CharacterData0E.java | 12 +-
generated/java/lang/CharacterDataLatin1.java | 12 +-
generated/sun/awt/X11/AwtGraphicsConfigData.java | 69 +-
generated/sun/awt/X11/AwtScreenData.java | 30 +-
generated/sun/awt/X11/ColorData.java | 62 +-
generated/sun/awt/X11/ColorEntry.java | 4 +-
generated/sun/awt/X11/Depth.java | 8 +-
generated/sun/awt/X11/PropMwmHints.java | 22 +-
generated/sun/awt/X11/Screen.java | 90 +-
generated/sun/awt/X11/ScreenFormat.java | 20 +-
generated/sun/awt/X11/Visual.java | 36 +-
generated/sun/awt/X11/XAnyEvent.java | 22 +-
generated/sun/awt/X11/XArc.java | 4 +-
generated/sun/awt/X11/XButtonEvent.java | 62 +-
generated/sun/awt/X11/XChar2b.java | 4 +-
generated/sun/awt/X11/XCharStruct.java | 4 +-
generated/sun/awt/X11/XCirculateEvent.java | 30 +-
generated/sun/awt/X11/XCirculateRequestEvent.java | 30 +-
generated/sun/awt/X11/XClassHint.java | 12 +-
generated/sun/awt/X11/XClientMessageEvent.java | 36 +-
generated/sun/awt/X11/XColor.java | 26 +-
generated/sun/awt/X11/XColormapEvent.java | 34 +-
generated/sun/awt/X11/XComposeStatus.java | 10 +-
generated/sun/awt/X11/XConfigureEvent.java | 54 +-
generated/sun/awt/X11/XConfigureRequestEvent.java | 58 +-
generated/sun/awt/X11/XCreateWindowEvent.java | 50 +-
generated/sun/awt/X11/XCrossingEvent.java | 70 +-
generated/sun/awt/X11/XDestroyWindowEvent.java | 26 +-
generated/sun/awt/X11/XErrorEvent.java | 30 +-
generated/sun/awt/X11/XEvent.java | 6 +-
generated/sun/awt/X11/XExposeEvent.java | 42 +-
generated/sun/awt/X11/XExtCodes.java | 4 +-
generated/sun/awt/X11/XExtData.java | 24 +-
generated/sun/awt/X11/XFocusChangeEvent.java | 30 +-
generated/sun/awt/X11/XFontProp.java | 10 +-
generated/sun/awt/X11/XFontSetExtents.java | 4 +-
generated/sun/awt/X11/XFontStruct.java | 64 +-
generated/sun/awt/X11/XGCValues.java | 94 +-
generated/sun/awt/X11/XGraphicsExposeEvent.java | 50 +-
generated/sun/awt/X11/XGravityEvent.java | 34 +-
generated/sun/awt/X11/XHostAddress.java | 6 +-
generated/sun/awt/X11/XIMCallback.java | 12 +-
generated/sun/awt/X11/XIMHotKeyTrigger.java | 14 +-
generated/sun/awt/X11/XIMHotKeyTriggers.java | 12 +-
generated/sun/awt/X11/XIMPreeditCaretCallbackStruct.java | 4 +-
generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java | 12 +-
generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java | 6 +-
generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java | 10 +-
generated/sun/awt/X11/XIMStringConversionCallbackStruct.java | 12 +-
generated/sun/awt/X11/XIMStringConversionText.java | 22 +-
generated/sun/awt/X11/XIMStyles.java | 12 +-
generated/sun/awt/X11/XIMText.java | 22 +-
generated/sun/awt/X11/XIMValuesList.java | 12 +-
generated/sun/awt/X11/XIconSize.java | 4 +-
generated/sun/awt/X11/XImage.java | 88 +-
generated/sun/awt/X11/XKeyEvent.java | 62 +-
generated/sun/awt/X11/XKeyboardControl.java | 4 +-
generated/sun/awt/X11/XKeyboardState.java | 16 +-
generated/sun/awt/X11/XKeymapEvent.java | 28 +-
generated/sun/awt/X11/XMapEvent.java | 30 +-
generated/sun/awt/X11/XMapRequestEvent.java | 26 +-
generated/sun/awt/X11/XMappingEvent.java | 34 +-
generated/sun/awt/X11/XModifierKeymap.java | 12 +-
generated/sun/awt/X11/XMotionEvent.java | 62 +-
generated/sun/awt/X11/XNoExposeEvent.java | 30 +-
generated/sun/awt/X11/XOMCharSetList.java | 12 +-
generated/sun/awt/X11/XOMFontInfo.java | 18 +-
generated/sun/awt/X11/XOMOrientation.java | 12 +-
generated/sun/awt/X11/XPixmapFormatValues.java | 4 +-
generated/sun/awt/X11/XPoint.java | 4 +-
generated/sun/awt/X11/XPropertyEvent.java | 34 +-
generated/sun/awt/X11/XRectangle.java | 4 +-
generated/sun/awt/X11/XReparentEvent.java | 42 +-
generated/sun/awt/X11/XResizeRequestEvent.java | 30 +-
generated/sun/awt/X11/XSegment.java | 4 +-
generated/sun/awt/X11/XSelectionClearEvent.java | 30 +-
generated/sun/awt/X11/XSelectionEvent.java | 38 +-
generated/sun/awt/X11/XSelectionRequestEvent.java | 42 +-
generated/sun/awt/X11/XSetWindowAttributes.java | 62 +-
generated/sun/awt/X11/XSizeHints.java | 74 +-
generated/sun/awt/X11/XStandardColormap.java | 42 +-
generated/sun/awt/X11/XTextItem.java | 18 +-
generated/sun/awt/X11/XTextItem16.java | 18 +-
generated/sun/awt/X11/XTextProperty.java | 18 +-
generated/sun/awt/X11/XTimeCoord.java | 14 +-
generated/sun/awt/X11/XUnmapEvent.java | 30 +-
generated/sun/awt/X11/XVisibilityEvent.java | 26 +-
generated/sun/awt/X11/XVisualInfo.java | 42 +-
generated/sun/awt/X11/XWMHints.java | 40 +-
generated/sun/awt/X11/XWindowAttributes.java | 74 +-
generated/sun/awt/X11/XWindowChanges.java | 14 +-
generated/sun/awt/X11/XdbeSwapInfo.java | 10 +-
generated/sun/awt/X11/XmbTextItem.java | 20 +-
generated/sun/awt/X11/XwcTextItem.java | 20 +-
generated/sun/awt/X11/awtImageData.java | 6 +-
generated/sun/misc/Version.java | 63 +-
generated/sun/nio/cs/StandardCharsets.java | 12 +-
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java | 49 +
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java | 191 ++
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java | 390 +++++
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 307 ++++
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java | 97 +
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 102 +
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 208 ++
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java | 118 +
overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java | 54 +
overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java | 103 +
overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java | 183 ++
overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java | 750 ++++++++++
patches/icedtea-hugepage-7034464.patch | 454 ++++++
patches/icedtea-hugepage-7037939.patch | 69 +
patches/jpegclasses.patch | 643 --------
patches/mark_sun_toolkit_privileged_code.patch | 11 -
patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch | 21 +
patches/openjdk/7021314-no_javaws_man_page.patch | 23 +
patches/pr633-no_javaws_man_page.patch | 14 -
122 files changed, 4557 insertions(+), 2039 deletions(-)
diffs (truncated from 9506 to 500 lines):
diff -r 9f374bb0cb94 -r bfbacc38e2ca ChangeLog
--- a/ChangeLog Fri May 06 10:59:07 2011 -0400
+++ b/ChangeLog Wed May 11 15:23:27 2011 +0100
@@ -1,3 +1,48 @@
+2011-05-10 Omair Majid <omajid at redhat.com>
+
+ Move pr633-no_javaws_man_page.patch to proper location
+ * Makefile.am (ICEDTEA_PATCHES): Update patch location and name.
+ * patches/pr633-no_javaws_man_page.patch: Remove.
+ * patches/openjdk/7021314-no_javaws_man_page.patch: New file. Backport
+ from OpenJDK7.
+
+2011-05-10 Omair Majid <omajid at redhat.com>
+
+ Move fix for S6599601 to proper location.
+ * Makefile.am (ICEDTEA_PATCHES): Update patch location and name.
+ * patches/mark_sun_toolkit_privileged_code.patch: Remove.
+ * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch: New
+ file. Backport from OpenJDK6.
+
+2011-05-10 Andrew Su <asu at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Removed patch jpegclasses.patch.
+ (stamps/overlay.stamp): Added jpeg class overlay path.
+ * patches/jpegclasses.patch: Removed
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java,
+ * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java: New classes.
+
+2011-05-09 Andrew Haley <aph at redhat.com>
+
+ * Makefile (ICEDTEA_PATCHES): Add icedtea-hugepage-7034464.patch,
+ patches/icedtea-hugepage-7037939.patch
+ * patches/icedtea-hugepage-7034464.patch: Support transparent huge
+ pages on Linux available since 2.6.38
+ * patches/icedtea-hugepage-7037939.patch: Disable adaptive
+ resizing if SHM large pages are used.
+ * NEWS: Add S7037939, S7034464.
+
2011-05-06 Omair Majid <omajid at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Replace
diff -r 9f374bb0cb94 -r bfbacc38e2ca Makefile.am
--- a/Makefile.am Fri May 06 10:59:07 2011 -0400
+++ b/Makefile.am Wed May 11 15:23:27 2011 +0100
@@ -230,7 +230,6 @@
patches/jvmtiEnv.patch \
patches/lcms.patch \
patches/print_lsb_release.patch \
- patches/jpegclasses.patch \
patches/uname.patch \
patches/freetypeversion.patch \
patches/nomotif-6706121.patch \
@@ -311,7 +310,7 @@
patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
patches/openjdk/6708580-exa_slow.patch \
patches/openjdk/6896068-sg2d.patch \
- patches/pr633-no_javaws_man_page.patch \
+ patches/openjdk/7021314-no_javaws_man_page.patch \
patches/pr586-include_all_srcs.patch \
patches/jtreg-LastErrorString.patch \
patches/openjdk/6663040-com.sun.awt.patch \
@@ -331,12 +330,14 @@
patches/openjdk/7027667-AAShapePipeRegTest.patch \
patches/openjdk/7019861-AA-regression-fix.patch \
patches/openjdk/6768387-jtable_not_serializable.patch \
- patches/mark_sun_toolkit_privileged_code.patch \
+ patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch \
patches/g356743-libpng-1.5.patch \
patches/revert-6885123.patch \
patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
patches/openjdk/7031385-gcc-register-allocation-fix.patch \
patches/shark-llvm-2.9.patch \
+ patches/icedtea-hugepage-7034464.patch \
+ patches/icedtea-hugepage-7037939.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
patches/openjdk/7036754-stroker-nan.patch
@@ -1163,6 +1164,7 @@
if ENABLE_NIO2
cp -r $(abs_top_srcdir)/overlays/nio2/openjdk/* openjdk/
endif
+ cp -r $(abs_top_srcdir)/overlays/jpeg/openjdk/* openjdk/
touch stamps/overlay.stamp
clean-overlay:
diff -r 9f374bb0cb94 -r bfbacc38e2ca NEWS
--- a/NEWS Fri May 06 10:59:07 2011 -0400
+++ b/NEWS Wed May 11 15:23:27 2011 +0100
@@ -22,6 +22,8 @@
- S6708580: Java applications slow when EXA enabled
- S7029905: demo applets missing some html files
- S6986968: Crash on XIM server restart
+ - S7034464: Support transparent large pages on Linux
+ - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used
- S7018387: Xrender pipeline may leak GC's
- S7036754: Stroked quads sometimes contain NaN
* Bug fixes
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/java/lang/CharacterData00.java
--- a/generated/java/lang/CharacterData00.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/java/lang/CharacterData00.java Wed May 11 15:23:27 2011 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/java/lang/CharacterData01.java
--- a/generated/java/lang/CharacterData01.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/java/lang/CharacterData01.java Wed May 11 15:23:27 2011 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/java/lang/CharacterData02.java
--- a/generated/java/lang/CharacterData02.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/java/lang/CharacterData02.java Wed May 11 15:23:27 2011 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/java/lang/CharacterData0E.java
--- a/generated/java/lang/CharacterData0E.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/java/lang/CharacterData0E.java Wed May 11 15:23:27 2011 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/java/lang/CharacterDataLatin1.java
--- a/generated/java/lang/CharacterDataLatin1.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/java/lang/CharacterDataLatin1.java Wed May 11 15:23:27 2011 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/sun/awt/X11/AwtGraphicsConfigData.java
--- a/generated/sun/awt/X11/AwtGraphicsConfigData.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/sun/awt/X11/AwtGraphicsConfigData.java Wed May 11 15:23:27 2011 +0100
@@ -8,7 +8,7 @@
public class AwtGraphicsConfigData extends XWrapperBase {
private Unsafe unsafe = XlibWrapper.unsafe;
private final boolean should_free_memory;
- public static int getSize() { return 92; }
+ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(92):(168)); }
public int getDataSize() { return getSize(); }
long pData;
@@ -16,14 +16,14 @@
public long getPData() { return pData; }
- AwtGraphicsConfigData(long addr) {
+ public AwtGraphicsConfigData(long addr) {
log.finest("Creating");
pData=addr;
should_free_memory = false;
}
- AwtGraphicsConfigData() {
+ public AwtGraphicsConfigData() {
log.finest("Creating");
pData = unsafe.allocateMemory(getSize());
should_free_memory = true;
@@ -39,36 +39,38 @@
}
public int get_awt_depth() { log.finest("");return (Native.getInt(pData+0)); }
public void set_awt_depth(int v) { log.finest(""); Native.putInt(pData+0, v); }
- public long get_awt_cmap() { log.finest("");return (Native.getLong(pData+4)); }
- public void set_awt_cmap(long v) { log.finest(""); Native.putLong(pData+4, v); }
- public XVisualInfo get_awt_visInfo() { log.finest("");return new XVisualInfo(pData + 8); }
- public int get_awt_num_colors() { log.finest("");return (Native.getInt(pData+48)); }
- public void set_awt_num_colors(int v) { log.finest(""); Native.putInt(pData+48, v); }
- public awtImageData get_awtImage(int index) { log.finest(""); return (Native.getLong(pData+52) != 0)?(new awtImageData(Native.getLong(pData+52)+index*304)):(null); }
- public long get_awtImage() { log.finest("");return Native.getLong(pData+52); }
- public void set_awtImage(long v) { log.finest(""); Native.putLong(pData + 52, v); }
- public long get_AwtColorMatch(int index) { log.finest(""); return Native.getLong(pData+56)+index*Native.getLongSize(); }
- public long get_AwtColorMatch() { log.finest("");return Native.getLong(pData+56); }
- public void set_AwtColorMatch(long v) { log.finest(""); Native.putLong(pData + 56, v); }
- public long get_monoImage(int index) { log.finest(""); return Native.getLong(pData+60)+index*Native.getLongSize(); }
- public long get_monoImage() { log.finest("");return Native.getLong(pData+60); }
- public void set_monoImage(long v) { log.finest(""); Native.putLong(pData + 60, v); }
- public long get_monoPixmap() { log.finest("");return (Native.getLong(pData+64)); }
- public void set_monoPixmap(long v) { log.finest(""); Native.putLong(pData+64, v); }
- public int get_monoPixmapWidth() { log.finest("");return (Native.getInt(pData+68)); }
- public void set_monoPixmapWidth(int v) { log.finest(""); Native.putInt(pData+68, v); }
- public int get_monoPixmapHeight() { log.finest("");return (Native.getInt(pData+72)); }
- public void set_monoPixmapHeight(int v) { log.finest(""); Native.putInt(pData+72, v); }
- public long get_monoPixmapGC() { log.finest("");return (Native.getLong(pData+76)); }
- public void set_monoPixmapGC(long v) { log.finest(""); Native.putLong(pData+76, v); }
- public int get_pixelStride() { log.finest("");return (Native.getInt(pData+80)); }
- public void set_pixelStride(int v) { log.finest(""); Native.putInt(pData+80, v); }
- public ColorData get_color_data(int index) { log.finest(""); return (Native.getLong(pData+84) != 0)?(new ColorData(Native.getLong(pData+84)+index*44)):(null); }
- public long get_color_data() { log.finest("");return Native.getLong(pData+84); }
- public void set_color_data(long v) { log.finest(""); Native.putLong(pData + 84, v); }
- public long get_glxInfo(int index) { log.finest(""); return Native.getLong(pData+88)+index*Native.getLongSize(); }
- public long get_glxInfo() { log.finest("");return Native.getLong(pData+88); }
- public void set_glxInfo(long v) { log.finest(""); Native.putLong(pData + 88, v); }
+ public long get_awt_cmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); }
+ public void set_awt_cmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); }
+ public XVisualInfo get_awt_visInfo() { log.finest("");return new XVisualInfo(pData + ((XlibWrapper.dataModel == 32)?(8):(16))); }
+ public int get_awt_num_colors() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)))); }
+ public void set_awt_num_colors(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(48):(80)), v); }
+ public awtImageData get_awtImage(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88))) != 0)?(new awtImageData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88)))+index*((XlibWrapper.dataModel == 32)?(304):(560)))):(null); }
+ public long get_awtImage() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(52):(88))); }
+ public void set_awtImage(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(52):(88)), v); }
+ public long get_AwtColorMatch(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(96)))+index*Native.getLongSize(); }
+ public long get_AwtColorMatch() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(56):(96))); }
+ public void set_AwtColorMatch(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(56):(96)), v); }
+ public long get_monoImage(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(104)))+index*Native.getLongSize(); }
+ public long get_monoImage() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(60):(104))); }
+ public void set_monoImage(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(60):(104)), v); }
+ public long get_monoPixmap() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(64):(112)))); }
+ public void set_monoPixmap(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(64):(112)), v); }
+ public int get_monoPixmapWidth() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(68):(120)))); }
+ public void set_monoPixmapWidth(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(68):(120)), v); }
+ public int get_monoPixmapHeight() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(72):(124)))); }
+ public void set_monoPixmapHeight(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(72):(124)), v); }
+ public long get_monoPixmapGC() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(76):(128)))); }
+ public void set_monoPixmapGC(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(76):(128)), v); }
+ public int get_pixelStride() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(80):(136)))); }
+ public void set_pixelStride(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(80):(136)), v); }
+ public ColorData get_color_data(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144))) != 0)?(new ColorData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144)))+index*((XlibWrapper.dataModel == 32)?(44):(88)))):(null); }
+ public long get_color_data() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(84):(144))); }
+ public void set_color_data(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(84):(144)), v); }
+ public long get_glxInfo(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(152)))+index*Native.getLongSize(); }
+ public long get_glxInfo() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(88):(152))); }
+ public void set_glxInfo(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(88):(152)), v); }
+ public int get_isTranslucencySupported() { log.finest("");return (Native.getInt(pData+160)); }
+ public void set_isTranslucencySupported(int v) { log.finest(""); Native.putInt(pData+160, v); }
String getName() {
@@ -93,6 +95,7 @@
ret += ""+"pixelStride = " + get_pixelStride() +", ";
ret += ""+"color_data = " + get_color_data() +", ";
ret += ""+"glxInfo = " + get_glxInfo() +", ";
+ ret += ""+"isTranslucencySupported = " + get_isTranslucencySupported() +", ";
return ret;
}
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/sun/awt/X11/AwtScreenData.java
--- a/generated/sun/awt/X11/AwtScreenData.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/sun/awt/X11/AwtScreenData.java Wed May 11 15:23:27 2011 +0100
@@ -8,7 +8,7 @@
public class AwtScreenData extends XWrapperBase {
private Unsafe unsafe = XlibWrapper.unsafe;
private final boolean should_free_memory;
- public static int getSize() { return 24; }
+ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(24):(48)); }
public int getDataSize() { return getSize(); }
long pData;
@@ -16,14 +16,14 @@
public long getPData() { return pData; }
- AwtScreenData(long addr) {
+ public AwtScreenData(long addr) {
log.finest("Creating");
pData=addr;
should_free_memory = false;
}
- AwtScreenData() {
+ public AwtScreenData() {
log.finest("Creating");
pData = unsafe.allocateMemory(getSize());
should_free_memory = true;
@@ -39,18 +39,18 @@
}
public int get_numConfigs() { log.finest("");return (Native.getInt(pData+0)); }
public void set_numConfigs(int v) { log.finest(""); Native.putInt(pData+0, v); }
- public long get_root() { log.finest("");return (Native.getLong(pData+4)); }
- public void set_root(long v) { log.finest(""); Native.putLong(pData+4, v); }
- public long get_whitepixel() { log.finest("");return (Native.getLong(pData+8)); }
- public void set_whitepixel(long v) { log.finest(""); Native.putLong(pData+8, v); }
- public long get_blackpixel() { log.finest("");return (Native.getLong(pData+12)); }
- public void set_blackpixel(long v) { log.finest(""); Native.putLong(pData+12, v); }
- public AwtGraphicsConfigData get_defaultConfig(int index) { log.finest(""); return (Native.getLong(pData+16) != 0)?(new AwtGraphicsConfigData(Native.getLong(pData+16)+index*92)):(null); }
- public long get_defaultConfig() { log.finest("");return Native.getLong(pData+16); }
- public void set_defaultConfig(long v) { log.finest(""); Native.putLong(pData + 16, v); }
- public long get_configs(int index) { log.finest(""); return Native.getLong(pData+20)+index*Native.getLongSize(); }
- public long get_configs() { log.finest("");return Native.getLong(pData+20); }
- public void set_configs(long v) { log.finest(""); Native.putLong(pData + 20, v); }
+ public long get_root() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); }
+ public void set_root(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); }
+ public long get_whitepixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))); }
+ public void set_whitepixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)), v); }
+ public long get_blackpixel() { log.finest("");return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)))); }
+ public void set_blackpixel(long v) { log.finest(""); Native.putLong(pData+((XlibWrapper.dataModel == 32)?(12):(24)), v); }
+ public AwtGraphicsConfigData get_defaultConfig(int index) { log.finest(""); return (Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32))) != 0)?(new AwtGraphicsConfigData(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32)))+index*((XlibWrapper.dataModel == 32)?(92):(168)))):(null); }
+ public long get_defaultConfig() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(16):(32))); }
+ public void set_defaultConfig(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(16):(32)), v); }
+ public long get_configs(int index) { log.finest(""); return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40)))+index*Native.getLongSize(); }
+ public long get_configs() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(20):(40))); }
+ public void set_configs(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(20):(40)), v); }
String getName() {
diff -r 9f374bb0cb94 -r bfbacc38e2ca generated/sun/awt/X11/ColorData.java
--- a/generated/sun/awt/X11/ColorData.java Fri May 06 10:59:07 2011 -0400
+++ b/generated/sun/awt/X11/ColorData.java Wed May 11 15:23:27 2011 +0100
@@ -8,7 +8,7 @@
public class ColorData extends XWrapperBase {
private Unsafe unsafe = XlibWrapper.unsafe;
private final boolean should_free_memory;
- public static int getSize() { return 44; }
+ public static int getSize() { return ((XlibWrapper.dataModel == 32)?(44):(88)); }
public int getDataSize() { return getSize(); }
long pData;
@@ -16,14 +16,14 @@
public long getPData() { return pData; }
- ColorData(long addr) {
+ public ColorData(long addr) {
log.finest("Creating");
pData=addr;
should_free_memory = false;
}
- ColorData() {
+ public ColorData() {
log.finest("Creating");
pData = unsafe.allocateMemory(getSize());
should_free_memory = true;
@@ -40,34 +40,34 @@
public ColorEntry get_awt_Colors(int index) { log.finest(""); return (Native.getLong(pData+0) != 0)?(new ColorEntry(Native.getLong(pData+0)+index*4)):(null); }
public long get_awt_Colors() { log.finest("");return Native.getLong(pData+0); }
public void set_awt_Colors(long v) { log.finest(""); Native.putLong(pData + 0, v); }
- public int get_awt_numICMcolors() { log.finest("");return (Native.getInt(pData+4)); }
- public void set_awt_numICMcolors(int v) { log.finest(""); Native.putInt(pData+4, v); }
- public int get_awt_icmLUT(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+8)+index*4); }
- public long get_awt_icmLUT() { log.finest("");return Native.getLong(pData+8); }
- public void set_awt_icmLUT(long v) { log.finest(""); Native.putLong(pData + 8, v); }
- public byte get_awt_icmLUT2Colors(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+12)+index*1); }
- public long get_awt_icmLUT2Colors() { log.finest("");return Native.getLong(pData+12); }
- public void set_awt_icmLUT2Colors(long v) { log.finest(""); Native.putLong(pData + 12, v); }
- public byte get_img_grays(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+16)+index*1); }
- public long get_img_grays() { log.finest("");return Native.getLong(pData+16); }
- public void set_img_grays(long v) { log.finest(""); Native.putLong(pData + 16, v); }
- public byte get_img_clr_tbl(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+20)+index*1); }
- public long get_img_clr_tbl() { log.finest("");return Native.getLong(pData+20); }
- public void set_img_clr_tbl(long v) { log.finest(""); Native.putLong(pData + 20, v); }
- public byte get_img_oda_red(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+24)+index*1); }
- public long get_img_oda_red() { log.finest("");return Native.getLong(pData+24); }
- public void set_img_oda_red(long v) { log.finest(""); Native.putLong(pData + 24, v); }
- public byte get_img_oda_green(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+28)+index*1); }
- public long get_img_oda_green() { log.finest("");return Native.getLong(pData+28); }
- public void set_img_oda_green(long v) { log.finest(""); Native.putLong(pData + 28, v); }
- public byte get_img_oda_blue(int index) { log.finest(""); return Native.getByte(Native.getLong(pData+32)+index*1); }
- public long get_img_oda_blue() { log.finest("");return Native.getLong(pData+32); }
- public void set_img_oda_blue(long v) { log.finest(""); Native.putLong(pData + 32, v); }
- public int get_pGrayInverseLutData(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+36)+index*4); }
- public long get_pGrayInverseLutData() { log.finest("");return Native.getLong(pData+36); }
- public void set_pGrayInverseLutData(long v) { log.finest(""); Native.putLong(pData + 36, v); }
- public int get_screendata() { log.finest("");return (Native.getInt(pData+40)); }
- public void set_screendata(int v) { log.finest(""); Native.putInt(pData+40, v); }
+ public int get_awt_numICMcolors() { log.finest("");return (Native.getInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)))); }
+ public void set_awt_numICMcolors(int v) { log.finest(""); Native.putInt(pData+((XlibWrapper.dataModel == 32)?(4):(8)), v); }
+ public int get_awt_icmLUT(int index) { log.finest(""); return Native.getInt(Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16)))+index*4); }
+ public long get_awt_icmLUT() { log.finest("");return Native.getLong(pData+((XlibWrapper.dataModel == 32)?(8):(16))); }
+ public void set_awt_icmLUT(long v) { log.finest(""); Native.putLong(pData + ((XlibWrapper.dataModel == 32)?(8):(16)), v); }
More information about the distro-pkg-dev
mailing list