/hg/icedtea6: Backport S6736649, S6797139 and S6883341 to fix te...
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Jan 24 13:31:53 PST 2011
changeset c78edcdba40f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c78edcdba40f
author: Omair Majid <omajid at redhat.com>
date: Mon Jan 24 16:30:51 2011 -0500
Backport S6736649, S6797139 and S6883341 to fix text being truncated
in some swing controls
2011-01-24 Omair Majid <omajid at redhat.com>
NEWS: Update with the 3 backports
* Makefile.am (ICEDTEA_PATCHES): Add the patches
* patches/openjdk/6736649-text_bearings.patch: New file.
* patches/openjdk/6797139-jbutton_truncation.patch: Likewise.
* patches/openjdk/6883341-text_bearing_exception.patch: Likewise.
diffstat:
6 files changed, 829 insertions(+), 1 deletion(-)
ChangeLog | 8
Makefile.am | 5
NEWS | 3
patches/openjdk/6736649-text_bearings.patch | 112 +++
patches/openjdk/6797139-jbutton_truncation.patch | 610 ++++++++++++++++++
patches/openjdk/6883341-text_bearing_exception.patch | 92 ++
diffs (truncated from 869 to 500 lines):
diff -r 7f4514093373 -r c78edcdba40f ChangeLog
--- a/ChangeLog Mon Jan 24 21:09:58 2011 +0000
+++ b/ChangeLog Mon Jan 24 16:30:51 2011 -0500
@@ -1,3 +1,11 @@ 2011-01-24 Andrew John Hughes <ahughes
+2011-01-24 Omair Majid <omajid at redhat.com>
+
+ * NEWS: Update with the 3 backports
+ * Makefile.am (ICEDTEA_PATCHES): Add the patches
+ * patches/openjdk/6736649-text_bearings.patch: New file.
+ * patches/openjdk/6797139-jbutton_truncation.patch: Likewise.
+ * patches/openjdk/6883341-text_bearing_exception.patch: Likewise.
+
2011-01-24 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add unlisted backports.
diff -r 7f4514093373 -r c78edcdba40f Makefile.am
--- a/Makefile.am Mon Jan 24 21:09:58 2011 +0000
+++ b/Makefile.am Mon Jan 24 16:30:51 2011 -0500
@@ -274,7 +274,10 @@ ICEDTEA_PATCHES = \
patches/6703377-freetypescaler.patch \
patches/ia64-fix.patch \
patches/openjdk/6642612-filechooser_button_sizes.patch \
- patches/jtreg-international-fonts-styles.patch
+ patches/jtreg-international-fonts-styles.patch \
+ patches/openjdk/6736649-text_bearings.patch \
+ patches/openjdk/6797139-jbutton_truncation.patch \
+ patches/openjdk/6883341-text_bearing_exception.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 7f4514093373 -r c78edcdba40f NEWS
--- a/NEWS Mon Jan 24 21:09:58 2011 +0000
+++ b/NEWS Mon Jan 24 16:30:51 2011 -0500
@@ -399,6 +399,9 @@ New in release 1.10 (2011-XX-XX):
- S6642612: JFileChooser's approve buttons should be the same size (GTK)
- S6984543: Test sun/java2d/DirectX/OnScreenRenderingResizeTest fails on GNOME
- S6997495: correction of regression test compiler/6857159/Test6857159
+ - S6736649: test/closed/javax/swing/JMenuItem/6458123/ManualBug6458123.java fails on Linux
+ - S6797139: JButton title is truncating for some strings irrespective of preferred size.
+ - S6883341: SWAT: jdk7-b72 swat build(2009-09-17) threw exceptions when running Java2D demo by clicking Paint ta
* Bug fixes
- RH647157, RH582455: Update fontconfig files for rhel 6
- RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
diff -r 7f4514093373 -r c78edcdba40f patches/openjdk/6736649-text_bearings.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6736649-text_bearings.patch Mon Jan 24 16:30:51 2011 -0500
@@ -0,0 +1,112 @@
+# HG changeset patch
+# User mlapshin
+# Date 1219738583 -14400
+# Node ID e78c2f17a60646b8198279b2f676712094b833a0
+# Parent c9d407ab230941d41025428b25bc5d787cf7c18f
+6736649: test/closed/javax/swing/JMenuItem/6458123/ManualBug6458123.java fails on Linux
+Summary: Now text bearings are taken into account when labelRect width is calculated
+Reviewed-by: alexp
+
+diff -r c9d407ab2309 -r e78c2f17a606 src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
+--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java Tue Aug 12 17:59:58 2008 -0700
++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java Tue Aug 26 12:16:23 2008 +0400
+@@ -136,7 +136,7 @@
+
+ // accRect
+ if (!getAccText().equals("")) {
+- getAccSize().setWidth(accGu.computeStringWidth(getAccContext(),
++ getAccSize().setWidth(accGu.computeStringWidth(getAccContext(),
+ getAccFontMetrics().getFont(), getAccFontMetrics(),
+ getAccText()));
+ getAccSize().setHeight(getAccFontMetrics().getHeight());
+@@ -195,6 +195,7 @@
+ getHorizontalAlignment(), getVerticalAlignment(),
+ getHorizontalTextPosition(), getVerticalTextPosition(),
+ getViewRect(), iconRect, textRect, getGap());
++ textRect.width += getLeftTextExtraWidth() + getRightTextExtraWidth();
+ Rectangle labelRect = iconRect.union(textRect);
+ getLabelSize().setHeight(labelRect.height);
+ getLabelSize().setWidth(labelRect.width);
+diff -r c9d407ab2309 -r e78c2f17a606 src/share/classes/sun/swing/MenuItemLayoutHelper.java
+--- openjdk/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java Tue Aug 12 17:59:58 2008 -0700
++++ openjdk/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java Tue Aug 26 12:16:23 2008 +0400
+@@ -83,6 +83,9 @@
+ private int afterCheckIconGap;
+ private int minTextOffset;
+
++ private int leftTextExtraWidth;
++ private int rightTextExtraWidth;
++
+ private Rectangle viewRect;
+
+ private RectSize iconSize;
+@@ -143,6 +146,7 @@
+ this.checkSize = new RectSize();
+ this.arrowSize = new RectSize();
+ this.labelSize = new RectSize();
++ calcExtraWidths();
+ calcWidthsAndHeights();
+ setOriginalWidths();
+ calcMaxWidths();
+@@ -151,6 +155,29 @@
+ calcMaxTextOffset(viewRect);
+ }
+
++ private void calcExtraWidths() {
++ leftTextExtraWidth = getLeftExtraWidth(text);
++ rightTextExtraWidth = getRightExtraWidth(text);
++ }
++
++ private int getLeftExtraWidth(String str) {
++ int lsb = SwingUtilities2.getLeftSideBearing(mi, fm, str);
++ if (lsb < 0) {
++ return -lsb;
++ } else {
++ return 0;
++ }
++ }
++
++ private int getRightExtraWidth(String str) {
++ int rsb = SwingUtilities2.getRightSideBearing(mi, fm, str);
++ if (rsb > 0) {
++ return rsb;
++ } else {
++ return 0;
++ }
++ }
++
+ private void setOriginalWidths() {
+ iconSize.origWidth = iconSize.width;
+ textSize.origWidth = textSize.width;
+@@ -286,6 +313,7 @@
+ verticalAlignment, horizontalAlignment,
+ verticalTextPosition, horizontalTextPosition,
+ viewRect, iconRect, textRect, gap);
++ textRect.width += leftTextExtraWidth + rightTextExtraWidth;
+ Rectangle labelRect = iconRect.union(textRect);
+ labelSize.height = labelRect.height;
+ labelSize.width = labelRect.width;
+@@ -727,7 +755,7 @@
+ }
+ }
+
+- /**
++ /**
+ * Sets Y coordinates of text and icon
+ * taking into account the vertical alignment
+ */
+@@ -1089,6 +1117,14 @@
+ this.labelSize = labelSize;
+ }
+
++ public int getLeftTextExtraWidth() {
++ return leftTextExtraWidth;
++ }
++
++ public int getRightTextExtraWidth() {
++ return rightTextExtraWidth;
++ }
++
+ /**
+ * Returns false if the component is a JMenu and it is a top
+ * level menu (on the menubar).
diff -r 7f4514093373 -r c78edcdba40f patches/openjdk/6797139-jbutton_truncation.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6797139-jbutton_truncation.patch Mon Jan 24 16:30:51 2011 -0500
@@ -0,0 +1,610 @@
+# HG changeset patch
+# User alexp
+# Date 1251899239 -14400
+# Node ID 281fbd82a971f05fcf6f2c31cfe7db7ef74909e9
+# Parent 935814bd43a62d1b2c6871f0298c5b59fbf54428
+6797139: JButton title is truncating for some strings irrespective of preferred size.
+Reviewed-by: peterz
+
+diff -r 935814bd43a6 -r 281fbd82a971 src/share/classes/javax/swing/SwingUtilities.java
+--- openjdk/jdk/src/share/classes/javax/swing/SwingUtilities.java Tue Sep 01 18:51:15 2009 +0400
++++ openjdk/jdk/src/share/classes/javax/swing/SwingUtilities.java Wed Sep 02 17:47:19 2009 +0400
+@@ -999,24 +999,20 @@
+ textR.height = (int) v.getPreferredSpan(View.Y_AXIS);
+ } else {
+ textR.width = SwingUtilities2.stringWidth(c, fm, text);
+-
+- // Take into account the left and right side bearings.
+- // This gives more space than it is actually needed,
+- // but there are two reasons:
+- // 1. If we set the width to the actual bounds,
+- // all callers would have to account for the bearings
+- // themselves. NOTE: all pref size calculations don't do it.
+- // 2. You can do a drawString at the returned location
+- // and the text won't be clipped.
+ lsb = SwingUtilities2.getLeftSideBearing(c, fm, text);
+ if (lsb < 0) {
++ // If lsb is negative, add it to the width and later
++ // adjust the x location. This gives more space than is
++ // actually needed.
++ // This is done like this for two reasons:
++ // 1. If we set the width to the actual bounds all
++ // callers would have to account for negative lsb
++ // (pref size calculations ONLY look at width of
++ // textR)
++ // 2. You can do a drawString at the returned location
++ // and the text won't be clipped.
+ textR.width -= lsb;
+ }
+- rsb = SwingUtilities2.getRightSideBearing(c, fm, text);
+- if (rsb > 0) {
+- textR.width += rsb;
+- }
+-
+ if (textR.width > availTextWidth) {
+ text = SwingUtilities2.clipString(c, fm, text,
+ availTextWidth);
+diff -r 935814bd43a6 -r 281fbd82a971 src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
+--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java Tue Sep 01 18:51:15 2009 +0400
++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java Wed Sep 02 17:47:19 2009 +0400
+@@ -195,7 +195,7 @@
+ getHorizontalAlignment(), getVerticalAlignment(),
+ getHorizontalTextPosition(), getVerticalTextPosition(),
+ getViewRect(), iconRect, textRect, getGap());
+- textRect.width += getLeftTextExtraWidth() + getRightTextExtraWidth();
++ textRect.width += getLeftTextExtraWidth();
+ Rectangle labelRect = iconRect.union(textRect);
+ getLabelSize().setHeight(labelRect.height);
+ getLabelSize().setWidth(labelRect.width);
+diff -r 935814bd43a6 -r 281fbd82a971 src/share/classes/sun/swing/MenuItemLayoutHelper.java
+--- openjdk/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java Tue Sep 01 18:51:15 2009 +0400
++++ openjdk/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java Wed Sep 02 17:47:19 2009 +0400
+@@ -84,7 +84,6 @@
+ private int minTextOffset;
+
+ private int leftTextExtraWidth;
+- private int rightTextExtraWidth;
+
+ private Rectangle viewRect;
+
+@@ -157,7 +156,6 @@
+
+ private void calcExtraWidths() {
+ leftTextExtraWidth = getLeftExtraWidth(text);
+- rightTextExtraWidth = getRightExtraWidth(text);
+ }
+
+ private int getLeftExtraWidth(String str) {
+@@ -169,15 +167,6 @@
+ }
+ }
+
+- private int getRightExtraWidth(String str) {
+- int rsb = SwingUtilities2.getRightSideBearing(mi, fm, str);
+- if (rsb > 0) {
+- return rsb;
+- } else {
+- return 0;
+- }
+- }
+-
+ private void setOriginalWidths() {
+ iconSize.origWidth = iconSize.width;
+ textSize.origWidth = textSize.width;
+@@ -313,7 +302,7 @@
+ verticalAlignment, horizontalAlignment,
+ verticalTextPosition, horizontalTextPosition,
+ viewRect, iconRect, textRect, gap);
+- textRect.width += leftTextExtraWidth + rightTextExtraWidth;
++ textRect.width += leftTextExtraWidth;
+ Rectangle labelRect = iconRect.union(textRect);
+ labelSize.height = labelRect.height;
+ labelSize.width = labelRect.width;
+@@ -1121,10 +1110,6 @@
+ return leftTextExtraWidth;
+ }
+
+- public int getRightTextExtraWidth() {
+- return rightTextExtraWidth;
+- }
+-
+ /**
+ * Returns false if the component is a JMenu and it is a top
+ * level menu (on the menubar).
+diff -r 935814bd43a6 -r 281fbd82a971 src/share/classes/sun/swing/SwingUtilities2.java
+--- openjdk/jdk/src/share/classes/sun/swing/SwingUtilities2.java Tue Sep 01 18:51:15 2009 +0400
++++ openjdk/jdk/src/share/classes/sun/swing/SwingUtilities2.java Wed Sep 02 17:47:19 2009 +0400
+@@ -27,7 +27,6 @@
+
+ import java.security.*;
+ import java.lang.reflect.*;
+-import java.lang.ref.SoftReference;
+ import java.awt.*;
+ import static java.awt.RenderingHints.*;
+ import java.awt.event.*;
+@@ -78,17 +77,23 @@
+ public static final Object LAF_STATE_KEY =
+ new StringBuffer("LookAndFeel State");
+
+- // Most of applications use 10 or less fonts simultaneously
+- private static final int STRONG_BEARING_CACHE_SIZE = 10;
+- // Strong cache for the left and right side bearings
+- // for STRONG_BEARING_CACHE_SIZE most recently used fonts.
+- private static BearingCacheEntry[] strongBearingCache =
+- new BearingCacheEntry[STRONG_BEARING_CACHE_SIZE];
+- // Next index to insert an entry into the strong bearing cache
+- private static int strongBearingCacheNextIndex = 0;
+- // Soft cache for the left and right side bearings
+- private static Set<SoftReference<BearingCacheEntry>> softBearingCache =
+- new HashSet<SoftReference<BearingCacheEntry>>();
++ // Maintain a cache of CACHE_SIZE fonts and the left side bearing
++ // of the characters falling into the range MIN_CHAR_INDEX to
++ // MAX_CHAR_INDEX. The values in fontCache are created as needed.
++ private static LSBCacheEntry[] fontCache;
++ // Windows defines 6 font desktop properties, we will therefore only
++ // cache the metrics for 6 fonts.
++ private static final int CACHE_SIZE = 6;
++ // nextIndex in fontCache to insert a font into.
++ private static int nextIndex;
++ // LSBCacheEntry used to search in fontCache to see if we already
++ // have an entry for a particular font
++ private static LSBCacheEntry searchKey;
++
++ // getLeftSideBearing will consult all characters that fall in the
++ // range MIN_CHAR_INDEX to MAX_CHAR_INDEX.
++ private static final int MIN_CHAR_INDEX = (int)'W';
++ private static final int MAX_CHAR_INDEX = (int)'W' + 1;
+
+ public static final FontRenderContext DEFAULT_FRC =
+ new FontRenderContext(null, false, false);
+@@ -183,6 +188,10 @@
+ private static final Object charsBufferLock = new Object();
+ private static char[] charsBuffer = new char[CHAR_BUFFER_SIZE];
+
++ static {
++ fontCache = new LSBCacheEntry[CACHE_SIZE];
++ }
++
+ /**
+ * checks whether TextLayout is required to handle characters.
+ *
+@@ -226,7 +235,9 @@
+
+ /**
+ * Returns the left side bearing of the first character of string. The
+- * left side bearing is calculated from the passed in FontMetrics.
++ * left side bearing is calculated from the passed in
++ * FontMetrics. If the passed in String is less than one
++ * character, this will throw a StringIndexOutOfBoundsException exception.
+ *
+ * @param c JComponent that will display the string
+ * @param fm FontMetrics used to measure the String width
+@@ -234,14 +245,11 @@
+ */
+ public static int getLeftSideBearing(JComponent c, FontMetrics fm,
+ String string) {
+- if ((string == null) || (string.length() == 0)) {
+- return 0;
+- }
+ return getLeftSideBearing(c, fm, string.charAt(0));
+ }
+
+ /**
+- * Returns the left side bearing of the specified character. The
++ * Returns the left side bearing of the first character of string. The
+ * left side bearing is calculated from the passed in FontMetrics.
+ *
+ * @param c JComponent that will display the string
+@@ -250,105 +258,37 @@
+ */
+ public static int getLeftSideBearing(JComponent c, FontMetrics fm,
+ char firstChar) {
+- return getBearing(c, fm, firstChar, true);
+- }
++ int charIndex = (int) firstChar;
++ if (charIndex < MAX_CHAR_INDEX && charIndex >= MIN_CHAR_INDEX) {
++ byte[] lsbs = null;
+
+- /**
+- * Returns the right side bearing of the last character of string. The
+- * right side bearing is calculated from the passed in FontMetrics.
+- *
+- * @param c JComponent that will display the string
+- * @param fm FontMetrics used to measure the String width
+- * @param string String to get the right side bearing for.
+- */
+- public static int getRightSideBearing(JComponent c, FontMetrics fm,
+- String string) {
+- if ((string == null) || (string.length() == 0)) {
+- return 0;
+- }
+- return getRightSideBearing(c, fm, string.charAt(string.length() - 1));
+- }
+-
+- /**
+- * Returns the right side bearing of the specified character. The
+- * right side bearing is calculated from the passed in FontMetrics.
+- *
+- * @param c JComponent that will display the string
+- * @param fm FontMetrics used to measure the String width
+- * @param lastChar Character to get the right side bearing for.
+- */
+- public static int getRightSideBearing(JComponent c, FontMetrics fm,
+- char lastChar) {
+- return getBearing(c, fm, lastChar, false);
+- }
+-
+- /* Calculates the left and right side bearing for a character.
+- * Strongly caches bearings for STRONG_BEARING_CACHE_SIZE
+- * most recently used Fonts and softly caches as many as GC allows.
+- */
+- private static int getBearing(JComponent comp, FontMetrics fm, char c,
+- boolean isLeftBearing) {
+- if (fm == null) {
+- if (comp == null) {
+- return 0;
+- } else {
+- fm = comp.getFontMetrics(comp.getFont());
+- }
+- }
+- synchronized (SwingUtilities2.class) {
+- BearingCacheEntry entry = null;
+- BearingCacheEntry searchKey = new BearingCacheEntry(fm);
+- // See if we already have an entry in the strong cache
+- for (BearingCacheEntry cacheEntry : strongBearingCache) {
+- if (searchKey.equals(cacheEntry)) {
+- entry = cacheEntry;
+- break;
++ FontRenderContext frc = getFontRenderContext(c, fm);
++ Font font = fm.getFont();
++ synchronized (SwingUtilities2.class) {
++ LSBCacheEntry entry = null;
++ if (searchKey == null) {
++ searchKey = new LSBCacheEntry(frc, font);
++ } else {
++ searchKey.reset(frc, font);
+ }
+- }
+- // See if we already have an entry in the soft cache
+- if (entry == null) {
+- Iterator<SoftReference<BearingCacheEntry>> iter =
+- softBearingCache.iterator();
+- while (iter.hasNext()) {
+- BearingCacheEntry cacheEntry = iter.next().get();
+- if (cacheEntry == null) {
+- // Remove discarded soft reference from the cache
+- iter.remove();
+- continue;
+- }
++ // See if we already have an entry for this pair
++ for (LSBCacheEntry cacheEntry : fontCache) {
+ if (searchKey.equals(cacheEntry)) {
+ entry = cacheEntry;
+- putEntryInStrongCache(entry);
+ break;
+ }
+ }
++ if (entry == null) {
++ // No entry for this pair, add it.
++ entry = searchKey;
++ fontCache[nextIndex] = searchKey;
++ searchKey = null;
++ nextIndex = (nextIndex + 1) % CACHE_SIZE;
++ }
++ return entry.getLeftSideBearing(firstChar);
+ }
+- if (entry == null) {
+- // No entry, add it
+- entry = searchKey;
+- cacheEntry(entry);
+- }
+- return (isLeftBearing)
+- ? entry.getLeftSideBearing(c)
+- : entry.getRightSideBearing(c);
+ }
+- }
+-
+- private synchronized static void cacheEntry(BearingCacheEntry entry) {
+- // Move the oldest entry from the strong cache into the soft cache
+- BearingCacheEntry oldestEntry =
+- strongBearingCache[strongBearingCacheNextIndex];
+- if (oldestEntry != null) {
+- softBearingCache.add(new SoftReference<BearingCacheEntry>(oldestEntry));
+- }
+- // Put entry in the strong cache
+- putEntryInStrongCache(entry);
+- }
+-
+- private synchronized static void putEntryInStrongCache(BearingCacheEntry entry) {
+- strongBearingCache[strongBearingCacheNextIndex] = entry;
+- strongBearingCacheNextIndex = (strongBearingCacheNextIndex + 1)
+- % STRONG_BEARING_CACHE_SIZE;
++ return 0;
+ }
+
+ /**
+@@ -1063,99 +1003,72 @@
+ }
+
+ /**
+- * BearingCacheEntry is used to cache left and right character bearings
+- * for a particular <code>Font</code> and <code>FontRenderContext</code>.
++ * LSBCacheEntry is used to cache the left side bearing (lsb) for
++ * a particular <code>Font</code> and <code>FontRenderContext</code>.
++ * This only caches characters that fall in the range
++ * <code>MIN_CHAR_INDEX</code> to <code>MAX_CHAR_INDEX</code>.
+ */
+- private static class BearingCacheEntry {
More information about the distro-pkg-dev
mailing list