Removing kaffeisms from java.awt.BorderLayout

[Pavel Roskin]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--96667023-958190953-929690568=:6274
Content-Type: TEXT/PLAIN; charset=US-ASCII

Hello!

java.awt.Component doesn't have field "flags" in JDK-1.1.7

This field should ideally be private in Kaffe. It would, however, require
rather serious changes,

What about java.awt.BorderLayout, I think that layout managers should be
as portable as possible. I see no reason for them to use Kaffe specific
extensions.

One could use Kaffe's layout managers with other VM's and tailor them for
specific needs.

The patch is attached.

Pavel Roskin

--96667023-958190953-929690568=:6274
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="BorderLayout.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.10.9906181122480.6274@proxy.typhoon.spb.ru>
Content-Description: 
Content-Disposition: attachment; filename="BorderLayout.diff"

SW5kZXg6IGxpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L0JvcmRlckxheW91
dC5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hv
bWUvY3ZzcHVibGljL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0
L0JvcmRlckxheW91dC5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS42
DQpkaWZmIC11IC1yMS42IEJvcmRlckxheW91dC5qYXZhDQotLS0gQm9yZGVy
TGF5b3V0LmphdmEJMTk5OS8wMy8yNCAwNzo1NjoxOAkxLjYNCisrKyBCb3Jk
ZXJMYXlvdXQuamF2YQkxOTk5LzA2LzE4IDA3OjE1OjI5DQpAQCAtMTUwLDI3
ICsxNTAsMjcgQEANCiANCiAJLy8gd2F0Y2ggb3V0IC0gSkRLIHNlZW1zIHRv
IGJ5cGFzcyBpc1Zpc2libGUoKSAod2hpY2ggbWlnaHQgYmUgcmVzb2x2ZWQs
IGUuZy4gYnkgU3dpbmcpDQogDQotCWlmICggKG5vcnRoICE9IG51bGwpICYm
ICgobm9ydGguZmxhZ3MgJiBDb21wb25lbnQuSVNfVklTSUJMRSkgIT0gMCkg
KSB7DQorCWlmICggKG5vcnRoICE9IG51bGwpICYmIChub3J0aC5pc1Zpc2li
bGUoKSkgKSB7DQogCQlwZCA9IG5vcnRoLmdldFByZWZlcnJlZFNpemUoKTsN
CiAJCW5vcnRoLnNldEJvdW5kcyhsZWZ0LCB0b3AsIHJpZ2h0IC0gbGVmdCwg
cGQuaGVpZ2h0KTsNCiAJCXRvcCArPSBwZC5oZWlnaHQgKyB2R2FwOw0KIAl9
DQotCWlmICgoc291dGggIT0gbnVsbCkgJiYgKChzb3V0aC5mbGFncyAmIENv
bXBvbmVudC5JU19WSVNJQkxFKSAhPSAwKSApIHsNCisJaWYgKChzb3V0aCAh
PSBudWxsKSAmJiAoc291dGguaXNWaXNpYmxlKCkpICkgew0KIAkJcGQgPSBz
b3V0aC5nZXRQcmVmZXJyZWRTaXplKCk7DQogCQlzb3V0aC5zZXRCb3VuZHMo
bGVmdCwgYm90dG9tIC0gcGQuaGVpZ2h0LCByaWdodCAtIGxlZnQsIHBkLmhl
aWdodCk7DQogCQlib3R0b20gLT0gcGQuaGVpZ2h0ICsgdkdhcDsNCiAJfQ0K
LQlpZiAoKGVhc3QgIT0gbnVsbCkgJiYgKChlYXN0LmZsYWdzICYgQ29tcG9u
ZW50LklTX1ZJU0lCTEUpICE9IDApICkgew0KKwlpZiAoKGVhc3QgIT0gbnVs
bCkgJiYgKGVhc3QuaXNWaXNpYmxlKCkpICkgew0KIAkJcGQgPSBlYXN0Lmdl
dFByZWZlcnJlZFNpemUoKTsNCiAJCWVhc3Quc2V0Qm91bmRzKHJpZ2h0IC0g
cGQud2lkdGgsIHRvcCwgcGQud2lkdGgsIGJvdHRvbSAtIHRvcCk7DQogCQly
aWdodCAtPSBwZC53aWR0aCArIGhHYXA7DQogCX0NCi0JaWYgKCh3ZXN0ICE9
IG51bGwpICYmICgod2VzdC5mbGFncyAmIENvbXBvbmVudC5JU19WSVNJQkxF
KSAhPSAwKSApIHsNCisJaWYgKCh3ZXN0ICE9IG51bGwpICYmICh3ZXN0Lmlz
VmlzaWJsZSgpKSApIHsNCiAJCXBkID0gd2VzdC5nZXRQcmVmZXJyZWRTaXpl
KCk7DQogCQl3ZXN0LnNldEJvdW5kcyhsZWZ0LCB0b3AsIHBkLndpZHRoLCBi
b3R0b20gLSB0b3ApOw0KIAkJbGVmdCArPSBwZC53aWR0aCArIGhHYXA7DQog
CX0NCi0JaWYgKChjZW50ZXIgIT0gbnVsbCkgJiYgKChjZW50ZXIuZmxhZ3Mg
JiBDb21wb25lbnQuSVNfVklTSUJMRSkgIT0gMCkgKQ0KKwlpZiAoKGNlbnRl
ciAhPSBudWxsKSAmJiAoY2VudGVyLmlzVmlzaWJsZSgpKSApDQogCQljZW50
ZXIuc2V0Qm91bmRzKGxlZnQsIHRvcCwgcmlnaHQgLSBsZWZ0LCBib3R0b20g
LSB0b3ApOw0KIH0NCiANCkBAIC0xOTgsMjcgKzE5OCwyNyBAQA0KIA0KIAkv
LyB3YXRjaCBvdXQgLSBKREsgc2VlbXMgdG8gaWdub3JlIGlzVmlzaWJsZSgp
IChtaWdodCBiZSByZXNvbHZlZCwgZS5nLiBieSBzd2luZykNCiANCi0JaWYg
KChlYXN0ICE9IG51bGwpICYmICgoZWFzdC5mbGFncyAmIENvbXBvbmVudC5J
U19WSVNJQkxFKSAhPSAwKSApIHsNCisJaWYgKChlYXN0ICE9IG51bGwpICYm
IChlYXN0LmlzVmlzaWJsZSgpKSApIHsNCiAJCW1kID0gZWFzdC5nZXRNaW5p
bXVtU2l6ZSgpOw0KIAkJZC53aWR0aCArPSBtZC53aWR0aCArIGhHYXA7DQog
CQlkLmhlaWdodCA9IE1hdGgubWF4KCBtZC5oZWlnaHQsIGQuaGVpZ2h0KTsN
CiAJfQ0KLQlpZiAoKHdlc3QgIT0gbnVsbCkgJiYgKCh3ZXN0LmZsYWdzICYg
Q29tcG9uZW50LklTX1ZJU0lCTEUpICE9IDApICl7DQorCWlmICgod2VzdCAh
PSBudWxsKSAmJiAod2VzdC5pc1Zpc2libGUoKSkgKSB7DQogCQltZCA9IHdl
c3QuZ2V0TWluaW11bVNpemUoKTsNCiAJCWQud2lkdGggKz0gbWQud2lkdGgg
KyBoR2FwOw0KIAkJZC5oZWlnaHQgPSBNYXRoLm1heCggbWQuaGVpZ2h0LCBk
LmhlaWdodCk7DQogCX0NCi0JaWYgKChjZW50ZXIgIT0gbnVsbCkgJiYgKChj
ZW50ZXIuZmxhZ3MgJiBDb21wb25lbnQuSVNfVklTSUJMRSkgIT0gMCkgKXsN
CisJaWYgKChjZW50ZXIgIT0gbnVsbCkgJiYgKGNlbnRlci5pc1Zpc2libGUo
KSkgKSB7DQogCQltZCA9IGNlbnRlci5nZXRNaW5pbXVtU2l6ZSgpOw0KIAkJ
ZC53aWR0aCArPSBtZC53aWR0aDsNCiAJCWQuaGVpZ2h0ID0gTWF0aC5tYXgo
IG1kLmhlaWdodCwgZC5oZWlnaHQpOw0KIAl9DQotCWlmICgobm9ydGggIT0g
bnVsbCkgJiYgKChub3J0aC5mbGFncyAmIENvbXBvbmVudC5JU19WSVNJQkxF
KSAhPSAwKSApew0KKwlpZiAoKG5vcnRoICE9IG51bGwpICYmIChub3J0aC5p
c1Zpc2libGUoKSkgKSB7DQogCQltZCA9IG5vcnRoLmdldE1pbmltdW1TaXpl
KCk7DQogCQlkLndpZHRoID0gTWF0aC5tYXgoIG1kLndpZHRoLCBkLndpZHRo
KTsNCiAJCWQuaGVpZ2h0ICs9IG1kLmhlaWdodCArIHZHYXA7DQogCX0NCi0J
aWYgKChzb3V0aCAhPSBudWxsKSAmJiAoKHNvdXRoLmZsYWdzICYgQ29tcG9u
ZW50LklTX1ZJU0lCTEUpICE9IDApICkgew0KKwlpZiAoKHNvdXRoICE9IG51
bGwpICYmIChzb3V0aC5pc1Zpc2libGUoKSkgKSB7DQogCQltZCA9IHNvdXRo
LmdldE1pbmltdW1TaXplKCk7DQogCQlkLndpZHRoID0gTWF0aC5tYXgoIG1k
LndpZHRoLCBkLndpZHRoKTsNCiAJCWQuaGVpZ2h0ICs9IG1kLmhlaWdodCAr
IHZHYXA7DQpAQCAtMjQzLDI3ICsyNDMsMjcgQEANCiANCiAJLy8gd2F0Y2gg
b3V0IC0gSkRLIHNlZW1zIHRvIGlnbm9yZSBzZXRWaXNpYmxlKCkgKHdoaWNo
IG1pZ2h0IGJlIHJlc29sdmVkLCBlLmcuIGJ5IHN3aW5nKQ0KIA0KLQlpZiAo
KGVhc3QgIT0gbnVsbCkgJiYgKChlYXN0LmZsYWdzICYgQ29tcG9uZW50LklT
X1ZJU0lCTEUpICE9IDApICkgew0KKwlpZiAoKGVhc3QgIT0gbnVsbCkgJiYg
KGVhc3QuaXNWaXNpYmxlKCkpICkgew0KIAkJcGQgPSBlYXN0LmdldFByZWZl
cnJlZFNpemUoKTsNCiAJCWQud2lkdGggKz0gcGQud2lkdGggKyBoR2FwOw0K
IAkJZC5oZWlnaHQgPSBNYXRoLm1heCggcGQuaGVpZ2h0LCBkLmhlaWdodCk7
DQogCX0NCi0JaWYgKCh3ZXN0ICE9IG51bGwpICYmICgod2VzdC5mbGFncyAm
IENvbXBvbmVudC5JU19WSVNJQkxFKSAhPSAwKSApIHsNCisJaWYgKCh3ZXN0
ICE9IG51bGwpICYmICh3ZXN0LmlzVmlzaWJsZSgpKSApIHsNCiAJCXBkID0g
d2VzdC5nZXRQcmVmZXJyZWRTaXplKCk7DQogCQlkLndpZHRoICs9IHBkLndp
ZHRoICsgaEdhcDsNCiAJCWQuaGVpZ2h0ID0gTWF0aC5tYXgoIHBkLmhlaWdo
dCwgZC5oZWlnaHQpOw0KIAl9DQotCWlmICgoY2VudGVyICE9IG51bGwpICYm
ICgoY2VudGVyLmZsYWdzICYgQ29tcG9uZW50LklTX1ZJU0lCTEUpICE9IDAp
ICkgew0KKwlpZiAoKGNlbnRlciAhPSBudWxsKSAmJiAoY2VudGVyLmlzVmlz
aWJsZSgpKSApIHsNCiAJCXBkID0gY2VudGVyLmdldFByZWZlcnJlZFNpemUo
KTsNCiAJCWQud2lkdGggKz0gcGQud2lkdGg7DQogCQlkLmhlaWdodCA9IE1h
dGgubWF4KCBwZC5oZWlnaHQsIGQuaGVpZ2h0KTsNCiAJfQ0KLQlpZiAoKG5v
cnRoICE9IG51bGwpICYmICgobm9ydGguZmxhZ3MgJiBDb21wb25lbnQuSVNf
VklTSUJMRSkgIT0gMCkgKSB7DQorCWlmICgobm9ydGggIT0gbnVsbCkgJiYg
KG5vcnRoLmlzVmlzaWJsZSgpKSApIHsNCiAJCXBkID0gbm9ydGguZ2V0UHJl
ZmVycmVkU2l6ZSgpOw0KIAkJZC53aWR0aCA9IE1hdGgubWF4KCBwZC53aWR0
aCwgZC53aWR0aCk7DQogCQlkLmhlaWdodCArPSBwZC5oZWlnaHQgKyB2R2Fw
Ow0KIAl9DQotCWlmICgoc291dGggIT0gbnVsbCkgJiYgKChzb3V0aC5mbGFn
cyAmIENvbXBvbmVudC5JU19WSVNJQkxFKSAhPSAwKSApew0KKwlpZiAoKHNv
dXRoICE9IG51bGwpICYmIChzb3V0aC5pc1Zpc2libGUoKSkgKSB7DQogCQlw
ZCA9IHNvdXRoLmdldFByZWZlcnJlZFNpemUoKTsNCiAJCWQud2lkdGggPSBN
YXRoLm1heCggcGQud2lkdGgsIGQud2lkdGgpOw0KIAkJZC5oZWlnaHQgKz0g
cGQuaGVpZ2h0ICsgdkdhcDsNCg==
--96667023-958190953-929690568=:6274--