summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-03-07 13:21:57 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2011-03-07 13:21:57 +0100
commit49be30721bf7d4d3922aafdd277ff43d0742c7fa (patch)
tree4e0eb91f2022bb04d7005c632a23ef19799e6902
parentb04a5364dfbf23f7e89c99894a558090ad9ad9cd (diff)
parent2197971dbc028f0874a92a164e630a01fc53adf3 (diff)
CWS-TOOLING: integrate CWS sb141ooo/DEV300_m102
-rwxr-xr-xrhino/makefile.mk3
-rw-r--r--rhino/rhino1_5R5-updateToolTip.patch23
2 files changed, 25 insertions, 1 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 008fb0c..88aad4f 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 0000000..16857d3
--- /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());