[PATCH] Menu fixes

[Dalibor Topic]

--------------Boundary-00=_4GIGPQ2V3X2QR4LH4006
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 8bit

hi,

this patch fixes a few small things with Menus. It changes
paramStrings and toString to a more comparable form where
it seems necessary. It fixes a bug in setHelpMenu() in MenuBar.

cheers,

dali

--------------Boundary-00=_4GIGPQ2V3X2QR4LH4006
Content-Type: text/plain;
  charset="iso-8859-15";
  name="ChangeLog"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="ChangeLog"

CSogbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvTWVudS5qYXZhOgoJKGNvdW50ZXIpIG5ldyBz
dGF0aWMgZmllbGQgdXNlZCBhcyBhbiBpbnN0YW5jZSBjb3VudGVyLgoJKE1lbnUpIG5vdyBzZXRz
IG1lbnUgbmFtZS4KCShnZXRNZW51QmFyKSBuZXcgbWV0aG9kLCB1c2VkIGJ5IGlzSGVscE1lbnUu
CgkoaXNIZWxwTWVudSkgbmV3IG1ldGhvZCwgdXNlZCB0byBjaGVjayBpcyB0aGlzIG1lbnUgaXMg
dGhlIGhlbHAKCW1lbnUuCgkocGFyYW1TdHJpbmcpIGFkZGVkIHN0YXRlIGluZm9ybWF0aW9uIGFu
ZCBpbXByb3ZlZCBjb21wYXJhYmlsaXR5Cgl3aXRoIEpESy4JCgkKCSogbGlicmFyaWVzL2phdmFs
aWIvamF2YS9hd3QvTWVudUJhci5qYXZhOgoJKGNvdW50ZXIpIG5ldyBzdGF0aWMgZmllbGQgdXNl
ZCBhcyBhbiBpbnN0YW5jZSBjb3VudGVyLgoJKE1lbnVCYXIpIG5vdyBzZXRzIG1lbnUgYmFyIG5h
bWUuCgkoc2V0SGVscE1lbnUpIG5vdyByZW1vdmVzIG9sZCBoZWxwIG1lbnUgYmVmb3JlIGl0IHNl
dHMgdGhlIG5ldwoJb25lLgoKCSogbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvTWVudUNvbXBv
bmVudC5qYXZhOgoJKHRvU3RyaW5nKSBpbXByb3ZlZCBjb21wYXJhYmlsaXR5IHdpdGggSkRLLgoJ
CgkqIGxpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L01lbnVJdGVtLmphdmE6CgkocGFyYW1TdHJp
bmcpIGltcHJvdmVkIGNvbXBhcmFiaWxpdHkgd2l0aCBKREsuCgkK

--------------Boundary-00=_4GIGPQ2V3X2QR4LH4006
Content-Type: text/x-diff;
  charset="iso-8859-15";
  name="patch.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch.diff"

ZGlmZiAtdXIgLXggQlVJTEQqIC14ICoubG9nIC14ICoubyAteCBNYWtlKiAteCBjb25maWcqIC14
ICouaW4gLXggaW5jbHVkZSAteCAqLipvIC14IG1hbiAteCBzY3JpcHRzIC14IGxpYnRvb2wgLXgg
Kndhcm5pbmdzIC14ICoubGEgLXggLmxpYnMgLXggcmVidWlsZExpYiogLXggVGVzdFNjcmlwdCBr
YWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9NZW51LmphdmEgcGF0Y2hlZC1rYWZmZS9s
aWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9NZW51LmphdmEKLS0tIGthZmZlL2xpYnJhcmllcy9q
YXZhbGliL2phdmEvYXd0L01lbnUuamF2YQlGcmkgTm92IDIzIDAwOjM4OjA2IDIwMDEKKysrIHBh
dGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvTWVudS5qYXZhCVNhdCBNYXIg
IDIgMDI6NTQ6MDEgMjAwMgpAQCAtMjAsNiArMjAsNyBAQAogCXByaXZhdGUgc3RhdGljIGZpbmFs
IGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IC04ODA5NTg0MTYzMzQ1NDk5Nzg0TDsKIAlWZWN0b3Ig
aXRlbXMgPSBuZXcgVmVjdG9yKCA1KTsKIAlib29sZWFuIGlzVGVhck9mZjsKKwlwcml2YXRlIHN0
YXRpYyBpbnQgY291bnRlcjsKIAogcHVibGljIE1lbnUoKSB7CiAJdGhpcyggbnVsbCwgZmFsc2Up
OwpAQCAtMzIsNiArMzMsNyBAQAogcHVibGljIE1lbnUoIFN0cmluZyBsYWJlbCwgYm9vbGVhbiB0
ZWFyT2ZmKSB7CiAJc3VwZXIoIGxhYmVsKTsKIAlpc1RlYXJPZmYgPSB0ZWFyT2ZmOworCXNldE5h
bWUoIm1lbnUiICsgY291bnRlcisrKTsKIH0KIAogcHVibGljIHN5bmNocm9uaXplZCBNZW51SXRl
bSBhZGQoIE1lbnVJdGVtIG1pKSB7CkBAIC0xMDYsNiArMTA4LDIzIEBACiAJcmV0dXJuIChjb3Vu
dEl0ZW1zKCkpOwogfQogCitwcml2YXRlIE1lbnVCYXIgZ2V0TWVudUJhcigpIHsKKwlNZW51Q29u
dGFpbmVyIHJvb3QgPSB0aGlzOworCisJdHJ5IHsKKwkJd2hpbGUgKCgoTWVudSkgcm9vdCkuZ2V0
UGFyZW50KCkgIT0gbnVsbCkgeworCQkJcm9vdCA9ICgoTWVudSkgcm9vdCkuZ2V0UGFyZW50KCk7
CisJCX0KKwl9CisJY2F0Y2ggKENsYXNzQ2FzdEV4Y2VwdGlvbiBlKSB7CisJCWlmIChyb290IGlu
c3RhbmNlb2YgTWVudUJhcikgeworCQkJcmV0dXJuIChNZW51QmFyKSByb290OworCQl9CisJfQor
CisJcmV0dXJuIG51bGw7Cit9CisKIE1lbnVJdGVtIGdldFNob3J0Y3V0TWVudUl0ZW0oIE1lbnVT
aG9ydGN1dCBzKSB7CiAJaW50IHN6ID0gaXRlbXMuc2l6ZSgpOwogCkBAIC0xMzgsMTIgKzE1Nywy
NSBAQAogCWluc2VydCggTWVudUl0ZW0uc2VwYXJhdG9yLCBpZHgpOwogfQogCitwcml2YXRlIGJv
b2xlYW4gaXNIZWxwTWVudSgpIHsKKwkvLyBmaW5kIHRoZSBtZW51IGJhciwgaWYgaXQgZXhpc3Rz
CisJTWVudUJhciBiYXIgPSBnZXRNZW51QmFyKCk7CisKKwkvLyBpZiB0aGVyZSBpcyBhIG1lbnUg
YmFyIGZvciB0aGlzIG1lbnUsIGFuZCBpdHMgaGVscCBtZW51IGlzCisJLy8gdGhpcyBtZW51LCB0
aGVuIHJldHVybiB0cnVlLgorCWlmIChiYXIgIT0gbnVsbCkgeworCQlyZXR1cm4gYmFyLmdldEhl
bHBNZW51KCkgPT0gdGhpczsKKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKIHB1YmxpYyBib29s
ZWFuIGlzVGVhck9mZigpIHsKIAlyZXR1cm4gaXNUZWFyT2ZmOwogfQogCiBwdWJsaWMgU3RyaW5n
IHBhcmFtU3RyaW5nKCkgewotCXJldHVybiBzdXBlci5wYXJhbVN0cmluZygpOworCXJldHVybiBz
dXBlci5wYXJhbVN0cmluZygpICsgIix0ZWFyT2ZmPSIgKyBpc1RlYXJPZmYoKSArICIsaXNIZWxw
TWVudT0iICsgaXNIZWxwTWVudSgpOwogfQogCiBwcm90ZWN0ZWQgdm9pZCBwcm9wYWdhdGVPbGRF
dmVudHMgKCBib29sZWFuIGlzT2xkRXZlbnRDbGllbnQgKSB7CmRpZmYgLXVyIC14IEJVSUxEKiAt
eCAqLmxvZyAteCAqLm8gLXggTWFrZSogLXggY29uZmlnKiAteCAqLmluIC14IGluY2x1ZGUgLXgg
Ki4qbyAteCBtYW4gLXggc2NyaXB0cyAteCBsaWJ0b29sIC14ICp3YXJuaW5ncyAteCAqLmxhIC14
IC5saWJzIC14IHJlYnVpbGRMaWIqIC14IFRlc3RTY3JpcHQga2FmZmUvbGlicmFyaWVzL2phdmFs
aWIvamF2YS9hd3QvTWVudUJhci5qYXZhIHBhdGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIv
amF2YS9hd3QvTWVudUJhci5qYXZhCi0tLSBrYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3
dC9NZW51QmFyLmphdmEJV2VkIE1hciAyNCAwMjoxNDozOCAxOTk5CisrKyBwYXRjaGVkLWthZmZl
L2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L01lbnVCYXIuamF2YQlGcmkgTWFyICAxIDE5OjQ3
OjI3IDIwMDIKQEAgLTIwLDkgKzIwLDExIEBACiB7CiAJVmVjdG9yIG1lbnVzID0gbmV3IFZlY3Rv
cigpOwogCU1lbnUgaGVscE1lbnU7CisJcHJpdmF0ZSBzdGF0aWMgaW50IGNvdW50ZXI7CiAJcHJp
dmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTQ5MzAzMjc5MTkzODg5
NTEyNjBMOwogCiBwdWJsaWMgTWVudUJhcigpIHsKKwlzZXROYW1lKCJtZW51YmFyIiArIGNvdW50
ZXIrKyk7CiB9CiAKIHB1YmxpYyBNZW51IGFkZCggTWVudSBtKSB7CkBAIC0xMjcsNiArMTI5LDEx
IEBACiB9CiAKIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBzZXRIZWxwTWVudSggTWVudSBtKSB7
CisJLy8gdXBkYXRlIGhlbHAgbWVudSBzdGF0dXMuCisJaWYgKGhlbHBNZW51ICE9IG51bGwpIHsK
KwkJcmVtb3ZlKGhlbHBNZW51KTsKKwl9CisKIAloZWxwTWVudSA9IG07CiAJdXBkYXRlVmlldygp
OwogfQpkaWZmIC11ciAteCBCVUlMRCogLXggKi5sb2cgLXggKi5vIC14IE1ha2UqIC14IGNvbmZp
ZyogLXggKi5pbiAteCBpbmNsdWRlIC14ICouKm8gLXggbWFuIC14IHNjcmlwdHMgLXggbGlidG9v
bCAteCAqd2FybmluZ3MgLXggKi5sYSAteCAubGlicyAteCByZWJ1aWxkTGliKiAteCBUZXN0U2Ny
aXB0IGthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L01lbnVDb21wb25lbnQuamF2YSBw
YXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L01lbnVDb21wb25lbnQuamF2
YQotLS0ga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvTWVudUNvbXBvbmVudC5qYXZh
CUZyaSBBcHIgMjMgMjA6MjI6MzYgMTk5OQorKysgcGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMvamF2
YWxpYi9qYXZhL2F3dC9NZW51Q29tcG9uZW50LmphdmEJRnJpIE1hciAgMSAxOToyMzo1NSAyMDAy
CkBAIC0xMDUsNiArMTA1LDYgQEAKIH0KIAogcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKLQly
ZXR1cm4gcGFyYW1TdHJpbmcoKTsKKwlyZXR1cm4gZ2V0Q2xhc3MoKS5nZXROYW1lKCkgKyAnWycg
KyBwYXJhbVN0cmluZygpICsgJ10nOwogfQogfQpkaWZmIC11ciAteCBCVUlMRCogLXggKi5sb2cg
LXggKi5vIC14IE1ha2UqIC14IGNvbmZpZyogLXggKi5pbiAteCBpbmNsdWRlIC14ICouKm8gLXgg
bWFuIC14IHNjcmlwdHMgLXggbGlidG9vbCAteCAqd2FybmluZ3MgLXggKi5sYSAteCAubGlicyAt
eCByZWJ1aWxkTGliKiAteCBUZXN0U2NyaXB0IGthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEv
YXd0L01lbnVJdGVtLmphdmEgcGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3
dC9NZW51SXRlbS5qYXZhCi0tLSBrYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9NZW51
SXRlbS5qYXZhCUZyaSBOb3YgMjMgMDA6Mzg6MDYgMjAwMQorKysgcGF0Y2hlZC1rYWZmZS9saWJy
YXJpZXMvamF2YWxpYi9qYXZhL2F3dC9NZW51SXRlbS5qYXZhCUZyaSBNYXIgIDEgMTk6MjE6MTQg
MjAwMgpAQCAtMTk5LDcgKzE5OSw3IEBACiB9CiAKIHB1YmxpYyBTdHJpbmcgcGFyYW1TdHJpbmco
KSB7Ci0JcmV0dXJuIGdldENsYXNzKCkuZ2V0TmFtZSgpICsgIltMYWJlbDogIiArIGxhYmVsICsg
Il0iOworCXJldHVybiBzdXBlci5wYXJhbVN0cmluZygpICsgIixsYWJlbD0iICsgbGFiZWw7CiB9
CiAKIHZvaWQgcHJvY2VzcyAoIEFjdGlvbkV2ZW50IGUgKSB7Cg==

--------------Boundary-00=_4GIGPQ2V3X2QR4LH4006--

_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com