From 3bd97d757d8cb357fc1f7a54dff69cc870c70429 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 23 Feb 2011 10:40:48 +0100 Subject: sb141: #i117015# include fix for Mac OS X specific failure --- rhino/makefile.mk | 3 ++- rhino/rhino1_5R5-updateToolTip.patch | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 rhino/rhino1_5R5-updateToolTip.patch (limited to 'rhino') diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 008fb0caef2d..88aad4ff1ac8 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -46,7 +46,8 @@ ADDITIONAL_FILES= \ toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java PATCH_FILES=rhino1_5R5.patch \ - rhino1_5R5-find_swing.patch + rhino1_5R5-find_swing.patch \ + rhino1_5R5-updateToolTip.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/rhino/rhino1_5R5-updateToolTip.patch b/rhino/rhino1_5R5-updateToolTip.patch new file mode 100644 index 000000000000..16857d35fca6 --- /dev/null +++ b/rhino/rhino1_5R5-updateToolTip.patch @@ -0,0 +1,23 @@ +--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:09 2011 ++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:01 2011 +@@ -1045,9 +1045,18 @@ + } ); + } + ++ // Fix taken from ++ // toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java: + private void updateToolTip() { +- // in case fileName is very long, try to set tool tip on frame +- Component c = getComponent(1); ++ // Try to set tool tip on frame. On Mac OS X 10.5, ++ // the number of components is different, so try to be safe. ++ int n = getComponentCount() - 1; ++ if (n > 1) { ++ n = 1; ++ } else if (n < 0) { ++ return; ++ } ++ Component c = getComponent(n); + // this will work at least for Metal L&F + if (c != null && c instanceof JComponent) { + ((JComponent)c).setToolTipText(getUrl()); -- cgit