/hg/icedtea6-hg: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 15 12:25:20 PDT 2013
changeset c23f233213f4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c23f233213f4
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue May 07 16:09:51 2013 +0200
JamVM: Update to 2013-05-06 revision.
2013-05-07 Xerxes R?nby <xerxes at zafena.se>
JamVM
- JSR 335: (lambda expressions) initial hack
- JEP 171: Implement fence methods in sun.misc.Unsafe
- Fix invokesuper check in invokespecial opcode
- Fix non-direct interpreter invokespecial super-class check
- When GC'ing a native method don't try to free code
- Do not free unprepared Miranda method code data
- Set anonymous class protection domain
- JVM_IsVMGeneratedMethodIx stub
- Dummy implementation of sun.misc.Perf natives
* NEWS: Updated.
* Makefile.am
(JAMVM_VERSION): Updated JamVM to 2013-05-06 revision.
(JAMVM_SHA256SUM): Updated.
changeset 29eed3efba72 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=29eed3efba72
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed May 15 16:48:54 2013 +0200
Added patch containing three new JTreg tests TextLayoutAscentDescent.java,
TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that
check the behavior of text layout subsystem.
changeset 2afb2999ac61 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2afb2999ac61
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 15 20:23:28 2013 +0100
Merge
changeset 095625ea8650 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=095625ea8650
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 15 20:25:05 2013 +0100
Remove reference to removed patch.
2013-05-15 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Remove reference to removed
patch patches/openjdk/8009641-8007675_build_fix.patch.
diffstat:
ChangeLog | 93 +
Makefile.am | 45 +-
NEWS | 10 +
patches/ecj/override.patch | 51 +
patches/jtreg-TextLayoutBoundsChecks.patch | 150 +
patches/openjdk/8004341-jck_dialog_failure.patch | 26 -
patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 -
patches/openjdk/8007393.patch | 78 -
patches/openjdk/8007611.patch | 24 -
patches/openjdk/8009641-8007675_build_fix.patch | 49 -
patches/security/20130201/6563318.patch | 36 -
patches/security/20130201/6664509.patch | 1322 -
patches/security/20130201/6776941.patch | 272 -
patches/security/20130201/7141694.patch | 87 -
patches/security/20130201/7173145.patch | 22 -
patches/security/20130201/7186945.patch | 10819 ----------
patches/security/20130201/7186948.patch | 20 -
patches/security/20130201/7186952.patch | 127 -
patches/security/20130201/7186954.patch | 81 -
patches/security/20130201/7192392.patch | 695 -
patches/security/20130201/7192393.patch | 60 -
patches/security/20130201/7192977.patch | 444 -
patches/security/20130201/7197546.patch | 479 -
patches/security/20130201/7200491.patch | 49 -
patches/security/20130201/7200500.patch | 60 -
patches/security/20130201/7201064.patch | 125 -
patches/security/20130201/7201066.patch | 66 -
patches/security/20130201/7201068.patch | 83 -
patches/security/20130201/7201070.patch | 31 -
patches/security/20130201/7201071.patch | 553 -
patches/security/20130201/8000210.patch | 104 -
patches/security/20130201/8000537.patch | 334 -
patches/security/20130201/8000540.patch | 187 -
patches/security/20130201/8000631.patch | 3964 ---
patches/security/20130201/8001242.patch | 61 -
patches/security/20130201/8001307.patch | 27 -
patches/security/20130201/8001972.patch | 438 -
patches/security/20130201/8002325.patch | 59 -
patches/security/20130219/8006446.patch | 395 -
patches/security/20130219/8006777.patch | 1036 -
patches/security/20130219/8007688.patch | 130 -
patches/security/20130304/8007014.patch | 477 -
patches/security/20130304/8007675.patch | 416 -
43 files changed, 309 insertions(+), 23818 deletions(-)
diffs (truncated from 24366 to 500 lines):
diff -r 3b76dff83564 -r 095625ea8650 ChangeLog
--- a/ChangeLog Tue Apr 30 13:18:33 2013 +0200
+++ b/ChangeLog Wed May 15 20:25:05 2013 +0100
@@ -1,3 +1,35 @@
+2013-05-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove reference to removed
+ patch patches/openjdk/8009641-8007675_build_fix.patch.
+
+2013-05-15 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Added new patch.
+ * patches/jtreg-TextLayoutBoundsChecks.patch:
+ Patch containing three new JTreg tests TextLayoutAscentDescent.java,
+ TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that
+ check the behavior of text layout subsystem.
+
+2013-05-07 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ JamVM
+ - JSR 335: (lambda expressions) initial hack
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Fix invokesuper check in invokespecial opcode
+ - Fix non-direct interpreter invokespecial super-class check
+ - When GC'ing a native method don't try to free code
+ - Do not free unprepared Miranda method code data
+ - Set anonymous class protection domain
+ - JVM_IsVMGeneratedMethodIx stub
+ - Dummy implementation of sun.misc.Perf natives
+ * NEWS: Updated.
+ * Makefile.am
+ (JAMVM_VERSION): Updated JamVM to 2013-05-06 revision.
+ (JAMVM_SHA256SUM): Updated.
+
2013-04-30 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
@@ -348,6 +380,62 @@
* patches/jvmtiEnv.patch: Moved to...
* patches/hotspot/original/jvmtiEnv.patch: here.
+2013-03-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8004341-jck_dialog_failure.patch,
+ * patches/openjdk/8005615-failure_to_load_logger_implementation.patch,
+ * patches/openjdk/8007393.patch,
+ * patches/openjdk/8007611.patch,
+ * patches/openjdk/8009641-8007675_build_fix.patch,
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch,
+ * patches/security/20130219/8006446.patch,
+ * patches/security/20130219/8006777.patch,
+ * patches/security/20130219/8007688.patch,
+ * patches/security/20130304/8007014.patch,
+ * patches/security/20130304/8007675.patch:
+ Remove patches available upstream.
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to jaxp144_05.zip
+ with latest security fix included.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Remove ones available
+ upstream (all from 2013/02/01, 2013/02/19
+ and 2013/03/04).
+ (ICEDTEA_PATCHES): Remove patches for
+ 8005615, 8004341, 8007393 & 8007611
+ available upstream.
+ * patches/ecj/override.patch:
+ Add new case introduced by upstream version
+ of security patches (sigh...)
+
2013-03-18 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
@@ -949,6 +1037,11 @@
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r 3b76dff83564 -r 095625ea8650 Makefile.am
--- a/Makefile.am Tue Apr 30 13:18:33 2013 +0200
+++ b/Makefile.am Wed May 15 20:25:05 2013 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 26_oct_2012
OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 68fe50ac34ec
@@ -11,8 +11,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82
-JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03
+JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3
+JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -263,39 +263,6 @@
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- patches/security/20130201/7201068.patch \
- patches/security/20130201/6563318.patch \
- patches/security/20130201/6664509.patch \
- patches/security/20130201/6776941.patch \
- patches/security/20130201/7141694.patch \
- patches/security/20130201/7173145.patch \
- patches/security/20130201/7186945.patch \
- patches/security/20130201/7186948.patch \
- patches/security/20130201/7186952.patch \
- patches/security/20130201/7186954.patch \
- patches/security/20130201/7192392.patch \
- patches/security/20130201/7192393.patch \
- patches/security/20130201/7192977.patch \
- patches/security/20130201/7197546.patch \
- patches/security/20130201/7200491.patch \
- patches/security/20130201/7200500.patch \
- patches/security/20130201/7201064.patch \
- patches/security/20130201/7201066.patch \
- patches/security/20130201/7201070.patch \
- patches/security/20130201/7201071.patch \
- patches/security/20130201/8000210.patch \
- patches/security/20130201/8000537.patch \
- patches/security/20130201/8000540.patch \
- patches/security/20130201/8000631.patch \
- patches/security/20130201/8001242.patch \
- patches/security/20130201/8001972.patch \
- patches/security/20130201/8002325.patch \
- patches/security/20130219/8006446.patch \
- patches/security/20130219/8006777.patch \
- patches/security/20130219/8007688.patch \
- patches/security/20130304/8007014.patch \
- patches/security/20130304/8007675.patch \
- patches/openjdk/8009641-8007675_build_fix.patch \
patches/openjdk/7036559-concurrenthashmap_improvements.patch \
patches/security/20130416/8009063.patch \
patches/openjdk/8004302-soap_test_failure.patch \
@@ -337,7 +304,6 @@
if !WITH_ALT_HSBUILD
SECURITY_PATCHES += \
- patches/security/20130201/8001307.patch \
patches/security/20130416/8004336.patch \
patches/security/20130416/8006309.patch \
patches/security/20130416/8009699.patch
@@ -530,8 +496,6 @@
patches/openjdk/6980681-corba_deadlock.patch \
patches/openjdk/7162902-corba_fixes.patch \
patches/traceable.patch \
- patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
- patches/openjdk/8004341-jck_dialog_failure.patch \
patches/pr1319-support_giflib_5.patch \
patches/openjdk/8007393.patch \
patches/openjdk/8007611.patch \
@@ -547,7 +511,8 @@
patches/openjdk/8009530-icu_kern_table_support_broken.patch \
patches/textLayoutGetCharacterCount.patch \
patches/textLayoutLimits.patch \
- patches/componentOrientationTests.patch
+ patches/componentOrientationTests.patch \
+ patches/jtreg-TextLayoutBoundsChecks.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 3b76dff83564 -r 095625ea8650 NEWS
--- a/NEWS Tue Apr 30 13:18:33 2013 +0200
+++ b/NEWS Wed May 15 20:25:05 2013 +0100
@@ -22,6 +22,16 @@
* Bug fixes
- PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
- RH902004: very bad performance with E-Porto Add-In für OpenOffice Writer installed (hs23 only)
+* JamVM
+ - JSR 335: (lambda expressions) initial hack
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Fix invokesuper check in invokespecial opcode
+ - Fix non-direct interpreter invokespecial super-class check
+ - When GC'ing a native method don't try to free code
+ - Do not free unprepared Miranda method code data
+ - Set anonymous class protection domain
+ - JVM_IsVMGeneratedMethodIx stub
+ - Dummy implementation of sun.misc.Perf natives
New in release 1.12.5 (2013-04-24):
diff -r 3b76dff83564 -r 095625ea8650 patches/ecj/override.patch
--- a/patches/ecj/override.patch Tue Apr 30 13:18:33 2013 +0200
+++ b/patches/ecj/override.patch Wed May 15 20:25:05 2013 +0100
@@ -311,3 +311,54 @@
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:24.027496931 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:56.968026902 +0000
+@@ -1040,7 +1040,6 @@
+
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1114,7 +1113,6 @@
+
+ javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+
+- @Override
+ public Void run() {
+ for (int i = 0; i < sig.length; i++) {
+ if (tracing) {
+@@ -1203,7 +1201,6 @@
+ final String className = opClassName;
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1239,7 +1236,6 @@
+ AccessControlContext stack = AccessController.getContext();
+ Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Object>() {
+
+- @Override
+ public Object run() {
+ try {
+ ReflectUtil.checkPackageAccess(method.getDeclaringClass());
+@@ -1676,7 +1672,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(respType);
+@@ -2854,7 +2849,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
diff -r 3b76dff83564 -r 095625ea8650 patches/jtreg-TextLayoutBoundsChecks.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-TextLayoutBoundsChecks.patch Wed May 15 20:25:05 2013 +0100
@@ -0,0 +1,150 @@
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++
++/**
++ * @test
++ * @run main TextLayoutAscentDescent
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's methods getAscent() and getDescent() work properly.
++ */
++public class TextLayoutAscentDescent {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false));
++
++ float ascent = tl.getAscent();
++ float descent = tl.getDescent();
++ if (ascent <= 0) {
++ throw new RuntimeException("Ascent " + ascent + " is <=0");
++ }
++ if (descent <= 0) {
++ throw new RuntimeException("Descent " + descent + " is <=0");
++ }
++ }
++}
++
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200
+@@ -0,0 +1,43 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++import java.awt.geom.Rectangle2D;
++
++/**
++ * @test
++ * @run main TextLayoutLimits2
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's method getBounds() works properly.
++ */
++public class TextLayoutBoundIsNotEmpty {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false));
++ Rectangle2D bounds = tl.getBounds();
++
++ if (bounds.isEmpty()) {
++ throw new RuntimeException("Bounds is empty: " + bounds.toString());
++ }
++ }
++}
++
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200
+@@ -0,0 +1,52 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++import java.awt.geom.Rectangle2D;
++
++/**
++ * @test
++ * @run main TextLayoutGetPixelBounds
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's method getPixelBounds() works properly.
++ */
++public class TextLayoutGetPixelBounds {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ FontRenderContext fontRenderContext = new FontRenderContext(null, false, false);
++ TextLayout tl = new TextLayout("JAVA", font, fontRenderContext);
++
++ Rectangle2D bounds = tl.getPixelBounds(fontRenderContext, 0.0f, 0.0f);
++ int width = (int) bounds.getWidth();
++ int height = (int) bounds.getHeight();
++ if (width <= 0) {
++ throw new RuntimeException("Width " + width + " is <=0");
++ }
++ if (height <= 0) {
++ throw new RuntimeException("Height " + height + " is <=0");
++ }
++ if (bounds.isEmpty()) {
++ throw new RuntimeException("Bounds is empty: " + bounds.toString());
++ }
++ }
++}
++
diff -r 3b76dff83564 -r 095625ea8650 patches/openjdk/8004341-jck_dialog_failure.patch
--- a/patches/openjdk/8004341-jck_dialog_failure.patch Tue Apr 30 13:18:33 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User denis
-# Date 1355221156 -14400
-# Node ID 090b35175a91906d75050f12a5f3e54c7da199e9
-# Parent 52029bcc00e103876c5149d7f95d9246e73d3435
-8004341: Two JCK tests fails with 7u11 b06
-Reviewed-by: serb, skoivu
-
-diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java
---- openjdk/jdk/src/share/classes/java/awt/Dialog.java
-+++ openjdk/jdk/src/share/classes/java/awt/Dialog.java
-@@ -1631,12 +1631,13 @@
- if (localModalityType == null) {
- this.modal = fields.get("modal", false);
- setModal(modal);
-+ } else {
-+ this.modalityType = localModalityType;
- }
-
- this.resizable = fields.get("resizable", true);
- this.undecorated = fields.get("undecorated", false);
- this.title = (String)fields.get("title", "");
-- this.modalityType = localModalityType;
-
- blockedWindows = new IdentityArrayList();
-
diff -r 3b76dff83564 -r 095625ea8650 patches/openjdk/8005615-failure_to_load_logger_implementation.patch
--- a/patches/openjdk/8005615-failure_to_load_logger_implementation.patch Tue Apr 30 13:18:33 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,542 +0,0 @@
-# HG changeset patch
-# User coffeys
-# Date 1360107230 0
-# Node ID cff0241d217f7b463d58ddcd0add8d41de9eb280
-# Parent dabed5898de907431b524952aade46f0b6b960aa
-8005615: Java Logger fails to load tomcat logger implementation (JULI)
-Reviewed-by: mchung
-
-diff --git a/src/share/classes/java/util/logging/LogManager.java b/src/share/classes/java/util/logging/LogManager.java
---- openjdk/jdk/src/share/classes/java/util/logging/LogManager.java
-+++ openjdk/jdk/src/share/classes/java/util/logging/LogManager.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2013, 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
-@@ -159,7 +159,7 @@
-
- // LoggerContext for system loggers and user loggers
- private final LoggerContext systemContext = new SystemLoggerContext();
-- private final LoggerContext userContext = new UserLoggerContext();
-+ private final LoggerContext userContext = new LoggerContext();
- private Logger rootLogger;
-
- // Have we done the primordial reading of the configuration file?
-@@ -197,13 +197,13 @@
-
- // Create and retain Logger for the root of the namespace.
More information about the distro-pkg-dev
mailing list