diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-22 09:26:26 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-22 09:26:26 +0100 |
| commit | 0c5d43ac09a57f67003c9a714dd3caf0b438625c (patch) | |
| tree | 3e817601c43eb2814705f78394da0faa8d78b576 /rhino | |
| parent | 03022d302c4a9e7e543de3388d5a68a43c95a689 (diff) | |
| parent | b59eaea542c154ed0b1d4677b20547c892e5e123 (diff) | |
Merge commit 'ooo/DEV300_m103'
Diffstat (limited to 'rhino')
| -rwxr-xr-x | rhino/makefile.mk | 3 | ||||
| -rw-r--r-- | rhino/rhino1_5R5-updateToolTip.patch | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 9f42ca2c8f83..094e1102ad2f 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 <ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip> ++ // 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()); |