[PATCH] small awt fixes

Dalibor Topic kaffe@rufus.w3.org
Mon, 4 Mar 2002 17:17:39 +0100



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

hi,

this patch continues the series of small toString() related fixes for
AWT, in order to improve its use when comparing debugging output on
kaffe and JDK. It also adds a method in java.awt.Toolkit, which allows
the Toolkit example from the Java Class Libraries book to run.

cheers,

dali.

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

CSogbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvQ29udGFpbmVyLmphdmE6CgkocGFyYW1TdHJp
bmcpIGltcHJvdmVkIGNvbXBhcmFiaWxpdHkgdG8gSkRLLgoJCgkqIGxpYnJhcmllcy9qYXZhbGli
L2phdmEvYXd0L0ZyYW1lLmphdmEKCShjb3VudGVyKSBuZXcgc3RhdGljIGZpZWxkLiBVc2VkIGFz
IGFuIGluc3RhbmNlIGNvdW50ZXIuCgkoRnJhbWUpIG5vdyBzZXRzIGl0cyBuYW1lLgoJKHBhcmFt
U3RyaW5nKSBuZXcgbWV0aG9kLgoKCSogbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvVG9vbGtp
dC5qYXZhCgkoZ2V0U2NyZWVuUmVzb2x1dGlvbikgbmV3IG1ldGhvZC4KCQoJKiBsaWJyYXJpZXMv
amF2YWxpYi9qYXZhL2F3dC93aWRnZXRzL0NoZWNrYm94LmphdmEKCShjb3VudGVyKSBuZXcgc3Rh
dGljIGZpZWxkLiBVc2VkIGFzIGFuIGluc3RhbmNlIGNvdW50ZXIuCgkoQ2hlY2tib3gpIG5vdyBz
ZXRzIGl0cyBuYW1lLgoJKHBhcmFtU3RyaW5nKSBpbXByb3ZlZCBjb21wYXJhYmlsaXR5IHdpdGgg
SkRLLgo=

--------------Boundary-00=_FLIG4F6VSBR83SK2LI2O
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
YWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9Db250YWluZXIuamF2YSBwYXRjaGVkLWth
ZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L0NvbnRhaW5lci5qYXZhCi0tLSBrYWZmZS9s
aWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9Db250YWluZXIuamF2YQlGcmkgTm92IDIzIDAwOjM4
OjA1IDIwMDEKKysrIHBhdGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvQ29u
dGFpbmVyLmphdmEJU2F0IE1hciAgMiAwOTo0MzozNiAyMDAyCkBAIC00NjMsNiArNDYzLDEwIEBA
CiAJfQogfQogCitwcm90ZWN0ZWQgU3RyaW5nIHBhcmFtU3RyaW5nKCkgeworICAgIHJldHVybiBz
dXBlci5wYXJhbVN0cmluZygpICsgIixsYXlvdXQ9IiArIGdldExheW91dCgpLmdldENsYXNzKCku
Z2V0TmFtZSgpOworfQorCiAvKioKICAqIEBkZXByZWNhdGVkLCB1c2UgZ2V0UHJlZmVycmVkU2l6
ZSgpLgogICovCmRpZmYgLXVyIC14IEJVSUxEKiAteCAqLmxvZyAteCAqLm8gLXggTWFrZSogLXgg
Y29uZmlnKiAteCAqLmluIC14IGluY2x1ZGUgLXggKi4qbyAteCBtYW4gLXggc2NyaXB0cyAteCBs
aWJ0b29sIC14ICp3YXJuaW5ncyAteCAqLmxhIC14IC5saWJzIC14IHJlYnVpbGRMaWIqIC14IFRl
c3RTY3JpcHQga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3QvRnJhbWUuamF2YSBwYXRj
aGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L0ZyYW1lLmphdmEKLS0tIGthZmZl
L2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L0ZyYW1lLmphdmEJV2VkIERlYyAxOSAyMzoyMToz
NCAyMDAxCisrKyBwYXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L0ZyYW1l
LmphdmEJRnJpIE1hciAgMSAxNzowNTo1OSAyMDAyCkBAIC0yMiw2ICsyMiw3IEBACiAJc3RhdGlj
IEluc2V0cyBmcmFtZUluc2V0czsKIAlzdGF0aWMgSW5zZXRzIG1lbnVGcmFtZUluc2V0czsKIAlz
dGF0aWMgUmVjdGFuZ2xlIGZyYW1lRGVjbzsKKwlwcml2YXRlIHN0YXRpYyBpbnQgY291bnRlcjsK
IAlmaW5hbCBwcml2YXRlIHN0YXRpYyBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAyNjczNDU4OTcx
MjU2MDc1MTE2TDsKIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBDUk9TU0hBSVJfQ1VSU09SID0g
Q3Vyc29yLkNST1NTSEFJUl9DVVJTT1I7CiAJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgREVGQVVM
VF9DVVJTT1IgPSBDdXJzb3IuREVGQVVMVF9DVVJTT1I7CkBAIC02MSw2ICs2Miw3IEBACiAJZmxh
Z3MgfD0gSVNfUkVTSVpBQkxFOwogCXRoaXMudGl0bGUgPSAodGl0bGUgPT0gbnVsbCkgPyAiIiA6
IHRpdGxlOwkKIAlkZWNvID0gZnJhbWVEZWNvOworCXNldE5hbWUoImZyYW1lIiArIGNvdW50ZXIr
Kyk7CiB9CiAKIHB1YmxpYyBGcmFtZSAoIFN0cmluZyB0aXRsZSApIHsKQEAgLTE3Nyw2ICsxNzks
MTAgQEAKIAkJCX0KIAkJfQogLy99Cit9CisKK3Byb3RlY3RlZCBTdHJpbmcgcGFyYW1TdHJpbmco
KSB7CisJcmV0dXJuIHN1cGVyLnBhcmFtU3RyaW5nKCkgKyAoaXNSZXNpemFibGUoKSA/ICIscmVz
aXphYmxlIiA6ICIsZml4ZWQiKSArICIsdGl0bGU9IiArIGdldFRpdGxlKCk7CiB9CiAKIC8qKgpk
aWZmIC11ciAteCBCVUlMRCogLXggKi5sb2cgLXggKi5vIC14IE1ha2UqIC14IGNvbmZpZyogLXgg
Ki5pbiAteCBpbmNsdWRlIC14ICouKm8gLXggbWFuIC14IHNjcmlwdHMgLXggbGlidG9vbCAteCAq
d2FybmluZ3MgLXggKi5sYSAteCAubGlicyAteCByZWJ1aWxkTGliKiAteCBUZXN0U2NyaXB0IGth
ZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L1Rvb2xraXQuamF2YSBwYXRjaGVkLWthZmZl
L2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L1Rvb2xraXQuamF2YQotLS0ga2FmZmUvbGlicmFy
aWVzL2phdmFsaWIvamF2YS9hd3QvVG9vbGtpdC5qYXZhCVdlZCBEZWMgMTkgMjM6MjE6MzQgMjAw
MQorKysgcGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC9Ub29sa2l0Lmph
dmEJRnJpIE1hciAgMSAxNToxNjo0NCAyMDAyCkBAIC0zODQsNiArMzg0LDEwIEBACiAJcmV0dXJu
IG51bGw7CiB9CiAKK3B1YmxpYyBpbnQgZ2V0U2NyZWVuUmVzb2x1dGlvbigpIHsKKwlyZXR1cm4g
cmVzb2x1dGlvbjsKK30KKwogcHVibGljIERpbWVuc2lvbiBnZXRTY3JlZW5TaXplICgpIHsKIAly
ZXR1cm4gc2NyZWVuU2l6ZTsKIH0KZGlmZiAtdXIgLXggQlVJTEQqIC14ICoubG9nIC14ICoubyAt
eCBNYWtlKiAteCBjb25maWcqIC14ICouaW4gLXggaW5jbHVkZSAteCAqLipvIC14IG1hbiAteCBz
Y3JpcHRzIC14IGxpYnRvb2wgLXggKndhcm5pbmdzIC14ICoubGEgLXggLmxpYnMgLXggcmVidWls
ZExpYiogLXggVGVzdFNjcmlwdCBrYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3dC93aWRn
ZXRzL0NoZWNrYm94LmphdmEgcGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2F3
dC93aWRnZXRzL0NoZWNrYm94LmphdmEKLS0tIGthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEv
YXd0L3dpZGdldHMvQ2hlY2tib3guamF2YQlXZWQgSmFuICA1IDAxOjAwOjQyIDIwMDAKKysrIHBh
dGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9hd3Qvd2lkZ2V0cy9DaGVja2JveC5q
YXZhCUZyaSBNYXIgIDEgMTY6Mzk6MjQgMjAwMgpAQCAtMjcsNiArMjcsOCBAQAogCWludCBzdGF0
ZTsKIAlTdHJpbmcgbGFiZWw7CiAJSXRlbUxpc3RlbmVyIGlMaXN0ZW5lcjsKKworCXB1YmxpYyBz
dGF0aWMgaW50IGNvdW50ZXI7CiAJc3RhdGljIGludCBDSEVDS0VEID0gMTsKIAlzdGF0aWMgaW50
IEhJTElHSFRFRCA9IDI7CiAKQEAgLTUwLDkgKzUyLDEwIEBACiAJdGhpcy5sYWJlbCA9IChsYWJl
bCA9PSBudWxsKSA/ICIiIDogbGFiZWw7CiAJc2V0Q2hlY2tib3hHcm91cCggZ3JvdXApOwogCXNl
dFN0YXRlKCBzdGF0ZSk7Ci0JCisJc2V0TmFtZSgiY2hlY2tib3giICsgY291bnRlcisrKTsKKwog
CXNldEZvcmVncm91bmQoIENvbG9yLmJsYWNrKTsKCXNldEZvbnQoIERlZmF1bHRzLlRleHRGb250
KTsKIAlhZGRNb3VzZUxpc3RlbmVyKCB0aGlzKTsKIAlhZGRGb2N1c0xpc3RlbmVyKCB0aGlzKTsK
IAlhZGRLZXlMaXN0ZW5lciggdGhpcyk7CkBAIC0yMDcsNyArMjEwLDcgQEAKIH0KIAogcHJvdGVj
dGVkIFN0cmluZyBwYXJhbVN0cmluZygpIHsKLQlyZXR1cm4gc3VwZXIucGFyYW1TdHJpbmcoKTsK
KwlyZXR1cm4gc3VwZXIucGFyYW1TdHJpbmcoKSArICIsbGFiZWw9IiArIGxhYmVsICsgIixzdGF0
ZT0iICsgZ2V0U3RhdGUoKTsKIH0KIAogLyoqIAoK

--------------Boundary-00=_FLIG4F6VSBR83SK2LI2O--


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