/hg/release/icedtea6-1.13: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Apr 15 21:00:11 UTC 2014
changeset 74f40b81e997 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=74f40b81e997
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 10 11:29:11 2014 +0100
Fix to build against 2014/04/15 security patches.
2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/merge_fix.patch,
* patches/openjdk/4685768-focus.patch,
* patches/openjdk/4993545-nativeinlightfixer.patch,
* patches/openjdk/6444769-windowwithwarningtest.patch,
* patches/openjdk/6607170-request_focus.patch,
* patches/openjdk/6607660-treelock.patch,
* patches/openjdk/6616323-component_array.patch,
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/6637796-set_bounds.patch,
* patches/openjdk/6656651-windows_lcd_glyphs.patch,
* patches/openjdk/6682046-shape_calculation.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6725214-direct3d-01.patch,
* patches/openjdk/6748082-isDisplayLocal.patch,
* patches/openjdk/6755274-glgetstring-crash.patch,
* patches/openjdk/6769607-modal-hangs.patch,
* patches/openjdk/6791612-opengl-jni-fix.patch,
* patches/openjdk/6797195-hw_lw_mixing.patch,
* patches/openjdk/6984543-onscreen_rendering_resize_test.patch,
* patches/openjdk/7110396-sound_code_build_fix.patch,
* patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
* patches/openjdk/oj6-29-jdk_version_info_zeroing.patch,
* patches/security/20120214/7112642.patch,
* patches/security/20130618/8009071-improve_shape_handling.patch:
Removed; upstreamed.
* Makefile.am:
(SPECIAL_SECURITY_PATCH_1): Removed.
(SPECIAL_SECURITY_PATCH_2): Likewise.
(LCMS_PATCHES): Add latest security fixes for users of in-tree LCMS2.
(UPSTREAMED_PATCHES): Set to empty.
(ICEDTEA_PATCHES): Remove upstreamed patches.
* patches/nomotif-6706121.patch: Regenerated.
* patches/security/20131015/8014098-better_profile_validation.patch,
* patches/security/20140415/8031335-better_colour_profiling.patch:
Security fixes for LCMS 2, taken from IcedTea 2.4.x.
changeset 5985a60a3f3a in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=5985a60a3f3a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 10 20:43:27 2014 +0100
Update from b31 tarball.
2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Update to b31 release date.
(OPENJDK_SHA256SUM): Set to hash of new b31 tarball.
changeset 9d4591d4cbf0 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=9d4591d4cbf0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 10 21:49:13 2014 +0100
Update NEWS with b31 changes.
2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: List changes imported from b31 tarball.
changeset 2d7b38708b8e in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=2d7b38708b8e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Apr 10 21:52:49 2014 +0100
Prepare for 1.13.3 release.
2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add unembargo date.
* configure.ac: Set to 1.13.3.
changeset d616ea6189f4 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=d616ea6189f4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 11 17:12:10 2014 +0100
Set version to b31.
2014-04-11 Andrew John Hughes <gnu.andrew at redhat.com>
(OPENJDK_VERSION): Set to b31.
changeset 46a990dcf085 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=46a990dcf085
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 15 21:59:13 2014 +0100
Added tag icedtea6-1.13.3 for changeset d616ea6189f4
diffstat:
.hgtags | 1 +
ChangeLog | 57 +
Makefile.am | 39 +-
NEWS | 69 +-
configure.ac | 2 +-
patches/merge_fix.patch | 280 -
patches/nomotif-6706121.patch | 270 +-
patches/openjdk/4685768-focus.patch | 398 -
patches/openjdk/4993545-nativeinlightfixer.patch | 408 -
patches/openjdk/6444769-windowwithwarningtest.patch | 352 -
patches/openjdk/6607170-request_focus.patch | 709 -
patches/openjdk/6607660-treelock.patch | 112 -
patches/openjdk/6616323-component_array.patch | 1083 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 6197 -
patches/openjdk/6637796-set_bounds.patch | 465 -
patches/openjdk/6656651-windows_lcd_glyphs.patch | 938 -
patches/openjdk/6682046-shape_calculation.patch | 506 -
patches/openjdk/6693253-security_warning.patch | 5391 -
patches/openjdk/6725214-direct3d-01.patch | 62027 ----------
patches/openjdk/6748082-isDisplayLocal.patch | 116 -
patches/openjdk/6755274-glgetstring-crash.patch | 56 -
patches/openjdk/6769607-modal-hangs.patch | 164 -
patches/openjdk/6791612-opengl-jni-fix.patch | 27 -
patches/openjdk/6797195-hw_lw_mixing.patch | 3277 -
patches/openjdk/6984543-onscreen_rendering_resize_test.patch | 30 -
patches/openjdk/7110396-sound_code_build_fix.patch | 22 -
patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch | 21 -
patches/openjdk/oj6-29-jdk_version_info_zeroing.patch | 21 -
patches/security/20120214/7112642.patch | 750 -
patches/security/20130618/8009071-improve_shape_handling.patch | 1014 -
patches/security/20131015/8014098-better_profile_validation.patch | 59 +
patches/security/20140415/8031335-better_colour_profiling.patch | 4433 +
32 files changed, 4776 insertions(+), 84518 deletions(-)
diffs (truncated from 90227 to 500 lines):
diff -r a1a682d73ee8 -r 46a990dcf085 .hgtags
--- a/.hgtags Fri Mar 28 18:26:56 2014 +0000
+++ b/.hgtags Tue Apr 15 21:59:13 2014 +0100
@@ -25,3 +25,4 @@
0770fe4c010590f293d189c83af2c49ac0c2268d icedtea6-1.13
eb77bc7992a9c321470c8426c901abd75ed8f567 icedtea6-1.13.1
84eda38cea6394a1973c62aed9e26086690db5c7 icedtea6-1.13.2
+d616ea6189f4d38427d0035eea31eb592ff90ebd icedtea6-1.13.3
diff -r a1a682d73ee8 -r 46a990dcf085 ChangeLog
--- a/ChangeLog Fri Mar 28 18:26:56 2014 +0000
+++ b/ChangeLog Tue Apr 15 21:59:13 2014 +0100
@@ -1,3 +1,60 @@
+2014-04-11 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ (OPENJDK_VERSION): Set to b31.
+
+2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add unembargo date.
+ * configure.ac: Set to 1.13.3.
+
+2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: List changes imported from b31 tarball.
+
+2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Update to b31 release date.
+ (OPENJDK_SHA256SUM): Set to hash of new b31 tarball.
+
+2014-04-10 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/merge_fix.patch,
+ * patches/openjdk/4685768-focus.patch,
+ * patches/openjdk/4993545-nativeinlightfixer.patch,
+ * patches/openjdk/6444769-windowwithwarningtest.patch,
+ * patches/openjdk/6607170-request_focus.patch,
+ * patches/openjdk/6607660-treelock.patch,
+ * patches/openjdk/6616323-component_array.patch,
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6637796-set_bounds.patch,
+ * patches/openjdk/6656651-windows_lcd_glyphs.patch,
+ * patches/openjdk/6682046-shape_calculation.patch,
+ * patches/openjdk/6693253-security_warning.patch,
+ * patches/openjdk/6725214-direct3d-01.patch,
+ * patches/openjdk/6748082-isDisplayLocal.patch,
+ * patches/openjdk/6755274-glgetstring-crash.patch,
+ * patches/openjdk/6769607-modal-hangs.patch,
+ * patches/openjdk/6791612-opengl-jni-fix.patch,
+ * patches/openjdk/6797195-hw_lw_mixing.patch,
+ * patches/openjdk/6984543-onscreen_rendering_resize_test.patch,
+ * patches/openjdk/7110396-sound_code_build_fix.patch,
+ * patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
+ * patches/openjdk/oj6-29-jdk_version_info_zeroing.patch,
+ * patches/security/20120214/7112642.patch,
+ * patches/security/20130618/8009071-improve_shape_handling.patch:
+ Removed; upstreamed.
+ * Makefile.am:
+ (SPECIAL_SECURITY_PATCH_1): Removed.
+ (SPECIAL_SECURITY_PATCH_2): Likewise.
+ (LCMS_PATCHES): Add latest security fixes for users of in-tree LCMS2.
+ (UPSTREAMED_PATCHES): Set to empty.
+ (ICEDTEA_PATCHES): Remove upstreamed patches.
+ * patches/nomotif-6706121.patch: Regenerated.
+ * patches/security/20131015/8014098-better_profile_validation.patch,
+ * patches/security/20140415/8031335-better_colour_profiling.patch:
+ Security fixes for LCMS 2, taken from IcedTea 2.4.x.
+
2014-03-28 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Fix OPENJDK6-29 bug reference.
diff -r a1a682d73ee8 -r 46a990dcf085 Makefile.am
--- a/Makefile.am Fri Mar 28 18:26:56 2014 +0000
+++ b/Makefile.am Tue Apr 15 21:59:13 2014 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 21_jan_2014
-OPENJDK_SHA256SUM = ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475
-OPENJDK_VERSION = b30
+OPENJDK_DATE = 15_apr_2014
+OPENJDK_SHA256SUM = 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb
+OPENJDK_VERSION = b31
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -286,9 +286,6 @@
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
-SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
-SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
-
if ENABLE_LCMS2
LCMS_PATCHES = \
patches/openjdk/lcms2/6523398-writing_tags.patch \
@@ -306,17 +303,16 @@
patches/openjdk/lcms2/bundled/8007925-improve_cmsstagealloclabv2tov4curves.patch \
patches/openjdk/lcms2/bundled/8009654-cmsnamed_stability.patch \
patches/openjdk/lcms2/bundled/7042594-tck_failure.patch \
- patches/openjdk/lcms2/bundled/8007927-improve_cmsallocprofilesequencedescription.patch
+ patches/openjdk/lcms2/bundled/8007927-improve_cmsallocprofilesequencedescription.patch \
+ patches/security/20131015/8014098-better_profile_validation.patch \
+ patches/security/20140415/8031335-better_colour_profiling.patch
endif
else
LCMS_PATCHES = \
patches/lcms.patch
endif
-UPSTREAMED_PATCHES = \
- patches/openjdk/7110396-sound_code_build_fix.patch \
- patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch \
- patches/openjdk/oj6-29-jdk_version_info_zeroing.patch
+UPSTREAMED_PATCHES =
ICEDTEA_PATCHES = \
$(DROP_PATCHES) \
@@ -324,25 +320,6 @@
$(UPSTREAMED_PATCHES) \
patches/openjdk/6733501-icedtea_lcms_test.patch \
$(LCMS_PATCHES) \
- patches/openjdk/4993545-nativeinlightfixer.patch \
- patches/openjdk/6637796-set_bounds.patch \
- patches/openjdk/6607660-treelock.patch \
- patches/openjdk/6607170-request_focus.patch \
- patches/openjdk/4685768-focus.patch \
- patches/openjdk/6616323-component_array.patch \
- patches/openjdk/6682046-shape_calculation.patch \
- patches/openjdk/6797195-hw_lw_mixing.patch \
- patches/openjdk/6725214-direct3d-01.patch \
- patches/openjdk/6748082-isDisplayLocal.patch \
- patches/openjdk/6633275-shaped_translucent_windows.patch \
- $(SPECIAL_SECURITY_PATCH_1) \
- patches/openjdk/6769607-modal-hangs.patch \
- patches/openjdk/6791612-opengl-jni-fix.patch \
- patches/openjdk/6755274-glgetstring-crash.patch \
- patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
- patches/openjdk/6693253-security_warning.patch \
- patches/openjdk/6444769-windowwithwarningtest.patch \
- patches/openjdk/6656651-windows_lcd_glyphs.patch \
patches/openjdk/6791502-invalid_icc_profile.patch \
patches/openjdk/6793818-jpegimagereader_too_greedy.patch \
patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \
@@ -362,7 +339,6 @@
patches/headers.patch \
patches/gcc-suffix.patch \
patches/libraries-splashscreen.patch \
- $(SPECIAL_SECURITY_PATCH_2) \
patches/uname.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
@@ -503,7 +479,6 @@
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
- patches/merge_fix.patch \
patches/traceable.patch \
patches/pr1319-support_giflib_5.patch \
patches/openjdk/6718364-inference_failure.patch \
diff -r a1a682d73ee8 -r 46a990dcf085 NEWS
--- a/NEWS Fri Mar 28 18:26:56 2014 +0000
+++ b/NEWS Tue Apr 15 21:59:13 2014 +0100
@@ -12,7 +12,74 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.13.3 (2014-04-XX):
+New in release 1.13.3 (2014-04-15):
+
+* Security fixes
+ - S8023046: Enhance splashscreen support
+ - S8025005: Enhance CORBA initializations
+ - S8025010, CVE-2014-2412: Enhance AWT contexts
+ - S8025030, CVE-2014-2414: Enhance stream handling
+ - S8025152, CVE-2014-0458: Enhance activation set up
+ - S8026067: Enhance signed jar verification
+ - S8026163, CVE-2014-2427: Enhance media provisioning
+ - S8026188, CVE-2014-2423: Enhance envelope factory
+ - S8026200: Enhance RowSet Factory
+ - S8026736, CVE-2014-2398: Enhance Javadoc pages
+ - S8026797, CVE-2014-0451: Enhance data transfers
+ - S8026801, CVE-2014-0452: Enhance endpoint addressing
+ - S8027766, CVE-2014-0453: Enhance RSA processing
+ - S8027775: Enhance ICU code.
+ - S8027841, CVE-2014-0429: Enhance pixel manipulations
+ - S8028385: Enhance RowSet Factory
+ - S8029282, CVE-2014-2403: Enhance CharInfo set up
+ - S8029286: Enhance subject delegation
+ - S8029699: Update Poller demo
+ - S8029730: Improve audio device additions
+ - S8029735: Enhance service mgmt natives
+ - S8029740, CVE-2014-0446: Enhance handling of loggers
+ - S8029750: Enhance LCMS color processing
+ - S8029760, CVE-2014-0462: Enhance AWT image libraries
+ - S8029854, CVE-2014-2421: Enhance JPEG decodings
+ - S8029858, CVE-2014-0456: Enhance array copies
+ - S8030731, CVE-2014-0460: Improve name service robustness
+ - S8031330: Refactor ObjectFactory
+ - S8031335, CVE-2014-0459: Better color profiling (LCMS 2 only)
+ - S8031352, CVE-2014-2405: Enhance PNG handling
+ - S8031394, CVE-2014-0457: (sl) Fix exception handling in ServiceLoader
+ - S8031395: Enhance LDAP processing
+ - S8033618, CVE-2014-1876: Correct logging output
+ - S8034926, CVE-2014-2397: Attribute classes properly
+ - S8036794, CVE-2014-0461: Manage JavaScript instances
+* Import of OpenJDK6 b31
+ - OJ27: Change summary generator can leave out last changeset
+ - OJ28: Report generator should not include old changes
+ - OJ30: Remove @Override annotation on interfaces added by 2014/04/15 security fixes.
+ - S6680198: UnmarshalException caused by incompatible serialVersionUID
+ - S6742654: Code insertion/replacement attacks against signed jars
+ - S6779717: A Window does not show applet security warning icon on X platforms
+ - S6785058: Parent dn't get the focus after dialog is closed if security warning is applied
+ - S6799345: JFC demos threw exception in the Java Console when applets are closed
+ - S6828273: javax/swing/system/6799345/TestShutdown.java test fails with RuntimeException.
+ - S6867515: Reduce impact of D3D initializion on startup time
+ - S6891435: Improve D3D preloading
+ - S6911041: JCK api/signaturetest tests fails for Mixed Code PIT builds (b91) for all trains
+ - S6921823: JarVerifier csdomain field not initialized
+ - S6921839: Update trusted.libraries list
+ - S6924497: HotSpotDiagnosticsMXBean.getDiagnosticOptions throws NPE
+ - S6936389: FontManager.fileCloser may cause memory leak in applets
+ - S6946559: AWTToolKit thread crashes in JNU_GetEnv
+ - S6955783: ServiceUnavailableException caught even the secondary DNS is available
+ - S6987967: D3D preloading thread should initialize COM
+ - S7011446: ./windows/classes/sun/awt/windows/WToolkit.java needs to avoid spurious wakeup
+ - S7015232: missing copyright header in CheckZOrderChange.java
+ - S7119760: [macosx] The OpenGL queue flusher thread is created in the wrong thread group
+ - S7155051: DNS provider may return incorrect results
+ - S8002191: AWT-Shutdown thread does not start with the AppletSecurity on Linux
+ - S8028388: 9 jaxws tests failed in nightly build with java.lang.ClassCastException
+ - S8031032: SQE test failures after JDK-8025010 was fixed
+ - S8031477: [macosx] Loading AWT native library fails
+ - S8032370: No "Truncated file" warning from IIOReadWarningListener on JPEGImageReader
+ - S8035834: InetAddress.getLocalHost() can hang after JDK-8030731 was fixed
New in release 1.13.2 (2014-03-28):
diff -r a1a682d73ee8 -r 46a990dcf085 configure.ac
--- a/configure.ac Fri Mar 28 18:26:56 2014 +0000
+++ b/configure.ac Tue Apr 15 21:59:13 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.13.3pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.13.3],[distro-pkg-dev at openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r a1a682d73ee8 -r 46a990dcf085 patches/merge_fix.patch
--- a/patches/merge_fix.patch Fri Mar 28 18:26:56 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Window.java openjdk/jdk/src/share/classes/java/awt/Window.java
---- openjdk.orig/jdk/src/share/classes/java/awt/Window.java 2012-09-19 14:30:11.949624069 +0100
-+++ openjdk/jdk/src/share/classes/java/awt/Window.java 2012-09-19 14:33:18.101297411 +0100
-@@ -362,6 +362,70 @@
- public void setLWRequestStatus(Window changed, boolean status) {
- changed.syncLWRequests = status;
- }
-+ public float getOpacity(Window window) {
-+ return window.opacity;
-+ }
-+ public void setOpacity(Window window, float opacity) {
-+ window.setOpacity(opacity);
-+ }
-+ public Shape getShape(Window window) {
-+ return window.getShape();
-+ }
-+ public void setShape(Window window, Shape shape) {
-+ window.setShape(shape);
-+ }
-+ public boolean isOpaque(Window window) {
-+ /*
-+ return window.getBackground().getAlpha() < 255;
-+ */
-+ synchronized (window.getTreeLock()) {
-+ return window.opaque;
-+ }
-+ }
-+ public void setOpaque(Window window, boolean opaque) {
-+ /*
-+ Color bg = window.getBackground();
-+ window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
-+ opaque ? 255 : 0));
-+ */
-+ window.setOpaque(opaque);
-+ }
-+ public void updateWindow(Window window, BufferedImage backBuffer) {
-+ window.updateWindow(backBuffer);
-+ }
-+
-+ public Dimension getSecurityWarningSize(Window window) {
-+ return new Dimension(window.securityWarningWidth,
-+ window.securityWarningHeight);
-+ }
-+
-+ public void setSecurityWarningSize(Window window, int width, int height)
-+ {
-+ window.securityWarningWidth = width;
-+ window.securityWarningHeight = height;
-+ }
-+
-+ public void setSecurityWarningPosition(Window window,
-+ Point2D point, float alignmentX, float alignmentY)
-+ {
-+ window.securityWarningPointX = point.getX();
-+ window.securityWarningPointY = point.getY();
-+ window.securityWarningAlignmentX = alignmentX;
-+ window.securityWarningAlignmentY = alignmentY;
-+
-+ synchronized (window.getTreeLock()) {
-+ WindowPeer peer = (WindowPeer)window.getPeer();
-+ if (peer != null) {
-+ peer.repositionSecurityWarning();
-+ }
-+ }
-+ }
-+
-+ public Point2D calculateSecurityWarningPosition(Window window,
-+ double x, double y, double w, double h)
-+ {
-+ return window.calculateSecurityWarningPosition(x, y, w, h);
-+ }
- });
- }
-
-@@ -3504,75 +3568,6 @@
- y + h * securityWarningAlignmentY + securityWarningPointY);
- }
-
-- static {
-- AWTAccessor.setWindowAccessor(new AWTAccessor.WindowAccessor() {
-- public float getOpacity(Window window) {
-- return window.opacity;
-- }
-- public void setOpacity(Window window, float opacity) {
-- window.setOpacity(opacity);
-- }
-- public Shape getShape(Window window) {
-- return window.getShape();
-- }
-- public void setShape(Window window, Shape shape) {
-- window.setShape(shape);
-- }
-- public boolean isOpaque(Window window) {
-- /*
-- return window.getBackground().getAlpha() < 255;
-- */
-- synchronized (window.getTreeLock()) {
-- return window.opaque;
-- }
-- }
-- public void setOpaque(Window window, boolean opaque) {
-- /*
-- Color bg = window.getBackground();
-- window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
-- opaque ? 255 : 0));
-- */
-- window.setOpaque(opaque);
-- }
-- public void updateWindow(Window window, BufferedImage backBuffer) {
-- window.updateWindow(backBuffer);
-- }
--
-- public Dimension getSecurityWarningSize(Window window) {
-- return new Dimension(window.securityWarningWidth,
-- window.securityWarningHeight);
-- }
--
-- public void setSecurityWarningSize(Window window, int width, int height)
-- {
-- window.securityWarningWidth = width;
-- window.securityWarningHeight = height;
-- }
--
-- public void setSecurityWarningPosition(Window window,
-- Point2D point, float alignmentX, float alignmentY)
-- {
-- window.securityWarningPointX = point.getX();
-- window.securityWarningPointY = point.getY();
-- window.securityWarningAlignmentX = alignmentX;
-- window.securityWarningAlignmentY = alignmentY;
--
-- synchronized (window.getTreeLock()) {
-- WindowPeer peer = (WindowPeer)window.getPeer();
-- if (peer != null) {
-- peer.repositionSecurityWarning();
-- }
-- }
-- }
--
-- public Point2D calculateSecurityWarningPosition(Window window,
-- double x, double y, double w, double h)
-- {
-- return window.calculateSecurityWarningPosition(x, y, w, h);
-- }
-- }); // WindowAccessor
-- } // static
--
- } // class Window
-
-
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-09-19 14:30:11.949624069 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java 2012-09-19 14:57:03.147675653 +0100
-@@ -26,6 +26,8 @@
- package sun.awt;
-
- import java.awt.*;
-+import java.awt.geom.Point2D;
-+import java.awt.image.BufferedImage;
-
- import sun.misc.Unsafe;
-
-@@ -63,6 +65,55 @@
- * components in the specified window to the specified value.
- */
- void setLWRequestStatus(Window changed, boolean status);
-+ /*
-+ * Get opacity level of the given window.
-+ */
-+ float getOpacity(Window window);
-+ /*
-+ * Set opacity level to the given window.
-+ */
-+ void setOpacity(Window window, float opacity);
-+ /*
-+ * Get a shape assigned to the given window.
-+ */
-+ Shape getShape(Window window);
-+ /*
-+ * Set a shape to the given window.
-+ */
-+ void setShape(Window window, Shape shape);
-+ /*
-+ * Identify whether the given window is opaque (true)
-+ * or translucent (false).
-+ */
-+ boolean isOpaque(Window window);
-+ /*
-+ * Set the opaque preoperty to the given window.
-+ */
-+ void setOpaque(Window window, boolean isOpaque);
-+ /*
-+ * Update the image of a non-opaque (translucent) window.
-+ */
-+ void updateWindow(Window window, BufferedImage backBuffer);
-+
-+ /** Get the size of the security warning.
-+ */
-+ Dimension getSecurityWarningSize(Window w);
-+
-+ /**
-+ * Set the size of the security warning.
-+ */
-+ void setSecurityWarningSize(Window w, int width, int height);
-+
-+ /** Set the position of the security warning.
-+ */
-+ void setSecurityWarningPosition(Window w, Point2D point,
-+ float alignmentX, float alignmentY);
-+
-+ /** Request to recalculate the new position of the security warning for
-+ * the given window size/location as reported by the native system.
-+ */
-+ Point2D calculateSecurityWarningPosition(Window window,
-+ double x, double y, double w, double h);
- }
-
- /*
-@@ -147,61 +198,6 @@
- }
-
- /*
-- * An interface of accessor for java.awt.Window class.
-- */
-- public interface WindowAccessor {
-- /*
-- * Get opacity level of the given window.
-- */
-- float getOpacity(Window window);
-- /*
-- * Set opacity level to the given window.
-- */
-- void setOpacity(Window window, float opacity);
-- /*
-- * Get a shape assigned to the given window.
-- */
-- Shape getShape(Window window);
-- /*
-- * Set a shape to the given window.
-- */
-- void setShape(Window window, Shape shape);
-- /*
-- * Identify whether the given window is opaque (true)
-- * or translucent (false).
-- */
-- boolean isOpaque(Window window);
-- /*
More information about the distro-pkg-dev
mailing list