Re: [codepatch] Re: [gui-dev] "Ability to send download filename to search box"
Marcin Okraszewski <[email protected]> Sun, 17 Jul 2005 23:38:03 +0200
| Newsgroups | gmane.network.gnutella.limewire.gui.devel |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------060806020504080009010707 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by www.limewire.org id j6HLao3s001948 Hi, I finally found some time to fit the patch into the new download pop up menu. It seems to work fine again. The attached patches contains grouped changes per project. Best regards, Marcin Okraszewski Felix Berger napisa=C5=82(a): > On Wednesday 01 June 2005 12:49 pm, Marcin Okraszewski wrote: >=20 >>Could you inform me if the branch which removes the DownloadPopupMenu i= s >>merged into the main trunk? >=20 >=20 > Hi Marcin, >=20 > the respective branch has been merged in the meantime.=20 >=20 > But, FYI, I refactored the SearchForKeyWordAction to be more generic in= =20 > another branch, it now also takes a searchinformation object as argumen= t and=20 > searchinformation objects can have a title different from the query tex= t. >=20 > Here's a link to the new SearchAction, except for the name it provides = the=20 > same arguments as the old one, so you don't have to wait for that branc= h to=20 > be merged in, in case you want to make use of that action. >=20 > http://www.limewire.org/fisheye/viewrep/limecvs/gui/com/limegroup/gnute= lla/gui/actions/SearchAction.java?r=3D1.1.2.2 >=20 > Regards, > Felix >=20 >=20 --------------060806020504080009010707 Content-Type: text/plain; name="search_core.txt" Content-Disposition: inline; filename="search_core.txt" Content-Transfer-Encoding: base64 PyAubmJpbnRkYgo/IG5icHJvamVjdAo/IGxpYi9jb3JlLmphcgpJbmRleDogY29tL2xpbWVn cm91cC9nbnV0ZWxsYS9Eb3dubG9hZGVyLmphdmEKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L2N2cy9jb3JlL2NvbS9saW1lZ3JvdXAvZ251dGVsbGEvRG93bmxvYWRlci5qYXZhLHYKcmV0 cmlldmluZyByZXZpc2lvbiAxLjQ3CmRpZmYgLUIgLWIgLXUgLXIxLjQ3IERvd25sb2FkZXIu amF2YQotLS0gY29tL2xpbWVncm91cC9nbnV0ZWxsYS9Eb3dubG9hZGVyLmphdmEJMTAgSnVs IDIwMDUgMTg6MDU6MDIgLTAwMDAJMS40NworKysgY29tL2xpbWVncm91cC9nbnV0ZWxsYS9E b3dubG9hZGVyLmphdmEJMTcgSnVsIDIwMDUgMjE6Mjc6MTAgLTAwMDAKQEAgLTI0Niw1ICsy NDYsMzQgQEAKIAkgKiBAcmV0dXJuCiAJICovCiAJcHVibGljIFVSTiBnZXRTSEExVXJuKCk7 CisgICAgCisgICAgLyoqCisgICAgICogU2V0cyBhIG5ldyBhdHRyaWJ1dGUgYXNzb2NpYXRl ZCB3aXRoIHRoZSBkb3dubG9hZC4KKyAgICAgKiBUaGUgYXR0cmlidXRlcyBhcmUgdXNlZCBl Zy4gYnkgR1VJIHRvIHN0b3JlIHNvbWUgZXh0cmEKKyAgICAgKiBpbmZvcm1hdGlvbiBhYm91 dCB0aGUgZG93bmxvYWQuCisgICAgICogQHBhcmFtIGtleSBBIGtleSB1c2VkIHRvIGlkZW50 aWZ5IHRoZSBhdHRyaWJ1dGUuCisgICAgICogQHBhdGFtIHZhbHVlIFRoZSB2YWx1ZSBvZiB0 aGUga2V5LgorICAgICAqIEByZXR1cm4gQSBwcnZpb3VzIHZhbHVlIG9mIHRoZSBhdHRyaWJ1 dGUsIG9yIDxjb2RlPm51bGw8L2NvZGU+CisgICAgICogICAgICAgICBpZiB0aGUgYXR0cmli dXRlIHdhc24ndCBzZXQuCisgICAgICovCisgICAgcHVibGljIE9iamVjdCBzZXRBdHRyaWJ1 dGUoIFN0cmluZyBrZXksIE9iamVjdCB2YWx1ZSApOworCisgICAgLyoqCisgICAgICogR2V0 cyBhIHZhbHVlIG9mIGF0dHJpYnV0ZSBhc3NvY2lhdGVkIHdpdGggdGhlIGRvd25sb2FkLgor ICAgICAqIFRoZSBhdHRyaWJ1dGVzIGFyZSB1c2VkIGVnLiBieSBHVUkgdG8gc3RvcmUgc29t ZSBleHRyYQorICAgICAqIGluZm9ybWF0aW9uIGFib3V0IHRoZSBkb3dubG9hZC4KKyAgICAg KiBAcGFyYW0ga2V5IEEga2V5IHdoaWNoIGlkZW50aWZpZXMgdGhlIGF0dHJpYnVlLgorICAg ICAqIEByZXR1cm4gVGhlIHZhbHVlIG9mIHRoZSBzcGVjaWZpZWQgYXR0cmlidXRlLAorICAg ICAqICAgICAgICAgb3IgPGNvZGU+bnVsbDwvY29kZT4gaWYgdmFsdWUgd2FzIG5vdCBzcGVj aWZpZWQuCisgICAgICovCisgICAgcHVibGljIE9iamVjdCBnZXRBdHRyaWJ1dGUoIFN0cmlu ZyBrZXkgKTsKKworICAgIC8qKgorICAgICAqIFJlbW92ZXMgYW4gYXR0cmlidXRlIGFzc29j aWF0ZWQgd2l0aCB0aGlzIGRvd25sb2FkLgorICAgICAqIEBwYXJhbSBrZXkgQSBrZXkgd2hp Y2ggaWRlbnRpZmllcyB0aGUgYXR0cmlidXRlIGRvIHJlbW92ZS4KKyAgICAgKiBAcmV0dXJu IEEgdmFsdWUgb2YgdGhlIGF0dHJpYnV0ZSBvciA8Y29kZT5udWxsPC9jb2RlPiBpZgorICAg ICAqICAgICAgICAgYXR0cmlidXRlIHdhcyBub3Qgc2V0LgorICAgICAqLworICAgIHB1Ymxp YyBPYmplY3QgcmVtb3ZlQXR0cmlidXRlKCBTdHJpbmcga2V5ICk7CiB9CiAKSW5kZXg6IGNv bS9saW1lZ3JvdXAvZ251dGVsbGEvZG93bmxvYWRlci9NYW5hZ2VkRG93bmxvYWRlci5qYXZh Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvY29yZS9jb20vbGltZWdyb3VwL2dudXRl bGxhL2Rvd25sb2FkZXIvTWFuYWdlZERvd25sb2FkZXIuamF2YSx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4zNDkKZGlmZiAtQiAtYiAtdSAtcjEuMzQ5IE1hbmFnZWREb3dubG9hZGVyLmph dmEKLS0tIGNvbS9saW1lZ3JvdXAvZ251dGVsbGEvZG93bmxvYWRlci9NYW5hZ2VkRG93bmxv YWRlci5qYXZhCTExIEp1bCAyMDA1IDE2OjU3OjQ3IC0wMDAwCTEuMzQ5CisrKyBjb20vbGlt ZWdyb3VwL2dudXRlbGxhL2Rvd25sb2FkZXIvTWFuYWdlZERvd25sb2FkZXIuamF2YQkxNyBK dWwgMjAwNSAyMToyNzoxNCAtMDAwMApAQCAtNTA0LDEwICs1MDQsMTggQEAKICAgICAgKi8K ICAgICBwcml2YXRlIHZvbGF0aWxlIGludCBpbmFjdGl2ZVByaW9yaXR5OwogICAgIAorICAg IC8qKgorICAgICAqIEEgbWFwIG9mIGF0dHJpYnV0ZXMgYXNzb2NpYXRlZCB3aXRoIHRoZSBk b3dubG9hZC4gVGhlIGF0dHJpYnV0ZXMKKyAgICAgKiBtYXkgYmUgdXNlZCBieSBHVUksIHRv IGtlZXAgc29tZSBhZGRpdGlvbmFsIGluZm9ybWF0aW9uIGFib3V0CisgICAgICogdGhlIGRv d25sb2FkLgorICAgICAqLworICAgIHByb3RlY3RlZCBNYXAgYXR0cmlidXRlcyA9IG5ldyBI YXNoTWFwKCk7CisKICAgICBwcm90ZWN0ZWQgTWFwIHByb3BlcnRpZXNNYXA7CiAgICAgCiAg ICAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVGQVVMVF9GSUxFTkFNRSA9ICJk ZWZhdWx0RmlsZU5hbWUiOwogICAgIHByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIEZJ TEVfU0laRSA9ICJmaWxlU2l6ZSI7CisgICAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJp bmcgQVRUUklCVVRFUyA9ICJhdHRyaWJ1dGVzIjsKICAgICAvKioKIAkgKiBUaGUga2V5IHVu ZGVyIHdoaWNoIHRoZSBzYXZlRmlsZSBGaWxlIGlzIHN0b3JlZCBpbiB0aGUgYXR0cmlidXRl IG1hcAogICAgICAqIHVzZWQgaW4gc2VyaWFsaXppbmcgYW5kIGRlc2VyaWFsaXppbmcgTWFu YWdlZERvd25sb2FkZXJzLiAKQEAgLTU4Myw2ICs1OTEsOCBAQAogICAgICAgICAgICAgc3Ry ZWFtLndyaXRlT2JqZWN0KGluY29tcGxldGVGaWxlTWFuYWdlcik7CiAgICAgICAgIH0KIAor ICAgICAgICBpZiAoICFwcm9wZXJ0aWVzTWFwLmNvbnRhaW5zS2V5KEFUVFJJQlVURVMpICkK KyAgICAgICAgICAgIHByb3BlcnRpZXNNYXAucHV0KEFUVFJJQlVURVMsIGF0dHJpYnV0ZXMp OwogICAgICAgICBzdHJlYW0ud3JpdGVPYmplY3QocHJvcGVydGllc01hcCk7CiAgICAgfQog CkBAIC02MjgsNiArNjM4LDggQEAKICAgICAgICAgaWYgKHByb3BlcnRpZXNNYXAuZ2V0KERF RkFVTFRfRklMRU5BTUUpID09IG51bGwpIHsKICAgICAgICAgICAgIHByb3BlcnRpZXNNYXAu cHV0KERFRkFVTFRfRklMRU5BTUUsIlVua25vd24gIisoKyt1bmtub3duSW5kZXgpKTsKICAg ICAgICAgfQorICAgICAgICBpZiAocHJvcGVydGllc01hcC5jb250YWluc0tleShBVFRSSUJV VEVTKSkgCisgICAgICAgICAgICBhdHRyaWJ1dGVzID0gKE1hcCkgcHJvcGVydGllc01hcC5n ZXQoQVRUUklCVVRFUyk7CiAgICAgfQogCiAgICAgLyoqIApAQCAtMzAwMSw2ICszMDEzLDQx IEBACiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KKyAgICAKKyAgICAvKioKKyAgICAgKiBTZXRzIGEgbmV3IGF0dHJpYnV0ZSBhc3Nv Y2lhdGVkIHdpdGggdGhlIGRvd25sb2FkLgorICAgICAqIFRoZSBhdHRyaWJ1dGVzIGFyZSB1 c2VkIGVnLiBieSBHVUkgdG8gc3RvcmUgc29tZSBleHRyYQorICAgICAqIGluZm9ybWF0aW9u IGFib3V0IHRoZSBkb3dubG9hZC4KKyAgICAgKiBAcGFyYW0ga2V5IEEga2V5IHVzZWQgdG8g aWRlbnRpZnkgdGhlIGF0dHJpYnV0ZS4KKyAgICAgKiBAcGF0YW0gdmFsdWUgVGhlIHZhbHVl IG9mIHRoZSBrZXkuCisgICAgICogQHJldHVybiBBIHBydmlvdXMgdmFsdWUgb2YgdGhlIGF0 dHJpYnV0ZSwgb3IgPGNvZGU+bnVsbDwvY29kZT4KKyAgICAgKiAgICAgICAgIGlmIHRoZSBh dHRyaWJ1dGUgd2Fzbid0IHNldC4KKyAgICAgKi8KKyAgICBwdWJsaWMgT2JqZWN0IHNldEF0 dHJpYnV0ZSggU3RyaW5nIGtleSwgT2JqZWN0IHZhbHVlICkgeworICAgICAgICByZXR1cm4g YXR0cmlidXRlcy5wdXQoIGtleSwgdmFsdWUgKTsKKyAgICB9CisKKyAgICAvKioKKyAgICAg KiBHZXRzIGEgdmFsdWUgb2YgYXR0cmlidXRlIGFzc29jaWF0ZWQgd2l0aCB0aGUgZG93bmxv YWQuCisgICAgICogVGhlIGF0dHJpYnV0ZXMgYXJlIHVzZWQgZWcuIGJ5IEdVSSB0byBzdG9y ZSBzb21lIGV4dHJhCisgICAgICogaW5mb3JtYXRpb24gYWJvdXQgdGhlIGRvd25sb2FkLgor ICAgICAqIEBwYXJhbSBrZXkgQSBrZXkgd2hpY2ggaWRlbnRpZmllcyB0aGUgYXR0cmlidWUu CisgICAgICogQHJldHVybiBUaGUgdmFsdWUgb2YgdGhlIHNwZWNpZmllZCBhdHRyaWJ1dGUs CisgICAgICogICAgICAgICBvciA8Y29kZT5udWxsPC9jb2RlPiBpZiB2YWx1ZSB3YXMgbm90 IHNwZWNpZmllZC4KKyAgICAgKi8KKyAgICBwdWJsaWMgT2JqZWN0IGdldEF0dHJpYnV0ZSgg U3RyaW5nIGtleSApIHsKKyAgICAgICAgcmV0dXJuIGF0dHJpYnV0ZXMuZ2V0KCBrZXkgKTsK KyAgICB9CisKKyAgICAvKioKKyAgICAgKiBSZW1vdmVzIGFuIGF0dHJpYnV0ZSBhc3NvY2lh dGVkIHdpdGggdGhpcyBkb3dubG9hZC4KKyAgICAgKiBAcGFyYW0ga2V5IEEga2V5IHdoaWNo IGlkZW50aWZpZXMgdGhlIGF0dHJpYnV0ZSBkbyByZW1vdmUuCisgICAgICogQHJldHVybiBB IHZhbHVlIG9mIHRoZSBhdHRyaWJ1dGUgb3IgPGNvZGU+bnVsbDwvY29kZT4gaWYKKyAgICAg KiAgICAgICAgIGF0dHJpYnV0ZSB3YXMgbm90IHNldC4KKyAgICAgKi8KKyAgICBwdWJsaWMg T2JqZWN0IHJlbW92ZUF0dHJpYnV0ZSggU3RyaW5nIGtleSApIHsKKyAgICAgICAgcmV0dXJu IGF0dHJpYnV0ZXMucmVtb3ZlKCBrZXkgKTsKKyAgICB9ICAgIAogfQogCiBpbnRlcmZhY2Ug TWVzaEhhbmRsZXIgewo= --------------060806020504080009010707 Content-Type: text/plain; name="search_gui.txt" Content-Disposition: inline; filename="search_gui.txt" Content-Transfer-Encoding: base64 PyAubmJpbnRkYgo/IG5icHJvamVjdAo/IGxpYi9MaW1lV2lyZS5qYXIKSW5kZXg6IGNvbS9s aW1lZ3JvdXAvZ251dGVsbGEvZ3VpL2Rvd25sb2FkL0Rvd25sb2FkRGF0YUxpbmUuamF2YQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2d1aS9jb20vbGltZWdyb3VwL2dudXRlbGxh L2d1aS9kb3dubG9hZC9Eb3dubG9hZERhdGFMaW5lLmphdmEsdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuNjEKZGlmZiAtQiAtYiAtdSAtcjEuNjEgRG93bmxvYWREYXRhTGluZS5qYXZhCi0t LSBjb20vbGltZWdyb3VwL2dudXRlbGxhL2d1aS9kb3dubG9hZC9Eb3dubG9hZERhdGFMaW5l LmphdmEJMTAgSnVsIDIwMDUgMTg6MDU6MDMgLTAwMDAJMS42MQorKysgY29tL2xpbWVncm91 cC9nbnV0ZWxsYS9ndWkvZG93bmxvYWQvRG93bmxvYWREYXRhTGluZS5qYXZhCTE3IEp1bCAy MDA1IDIxOjI1OjI0IC0wMDAwCkBAIC02MjEsNiArNjIxLDE0IEBACiAJCXJldHVybiBfc2l6 ZTsKIAl9CiAKKyAgICAvKioKKyAgICAgKiBSZXR1cm5zIG5hbWUgb2YgdGhlIGZpbGUgYmVp bmcgZG93bmxvYWRlZC4KKyAgICAgKiBAcmV0dXJuIG5hbWUgb2YgdGhlIGRvd25sb2FkZWQg ZmlsZS4KKyAgICAgKi8KKyAgICBwdWJsaWMgU3RyaW5nIGdldEZpbGVOYW1lKCkgeworICAg ICAgICByZXR1cm4gX2ZpbGVOYW1lOworICAgIH0KKyAgICAKIAkvKioKIAkgKiBSZXR1cm5z IHdoZXRoZXIgb3Igbm90IHRoZSA8dHQ+RG93bmxvYWRlcjwvdHQ+IGZvciB0aGlzIGRvd25s b2FkCiAJICogaXMgZXF1YWwgdG8gdGhlIG9uZSBwYXNzZWQgaW4uCkluZGV4OiBjb20vbGlt ZWdyb3VwL2dudXRlbGxhL2d1aS9kb3dubG9hZC9Eb3dubG9hZE1lZGlhdG9yLmphdmEKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9ndWkvY29tL2xpbWVncm91cC9nbnV0ZWxsYS9n dWkvZG93bmxvYWQvRG93bmxvYWRNZWRpYXRvci5qYXZhLHYKcmV0cmlldmluZyByZXZpc2lv biAxLjYzCmRpZmYgLUIgLWIgLXUgLXIxLjYzIERvd25sb2FkTWVkaWF0b3IuamF2YQotLS0g Y29tL2xpbWVncm91cC9nbnV0ZWxsYS9ndWkvZG93bmxvYWQvRG93bmxvYWRNZWRpYXRvci5q YXZhCTExIEp1bCAyMDA1IDE1OjUzOjA4IC0wMDAwCTEuNjMKKysrIGNvbS9saW1lZ3JvdXAv Z251dGVsbGEvZ3VpL2Rvd25sb2FkL0Rvd25sb2FkTWVkaWF0b3IuamF2YQkxNyBKdWwgMjAw NSAyMToyNToyNSAtMDAwMApAQCAtNiw2ICs2LDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuQXJy YXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkNv bXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIAogaW1wb3J0IGphdmF4LnN3aW5n LkFic3RyYWN0QWN0aW9uOwogaW1wb3J0IGphdmF4LnN3aW5nLkFjdGlvbjsKQEAgLTM1LDYg KzM2LDcgQEAKIGltcG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLmd1aS5hY3Rpb25zLkNv cHlNYWduZXRMaW5rVG9DbGlwYm9hcmRBY3Rpb247CiBpbXBvcnQgY29tLmxpbWVncm91cC5n bnV0ZWxsYS5ndWkuYWN0aW9ucy5MaW1lQWN0aW9uOwogaW1wb3J0IGNvbS5saW1lZ3JvdXAu Z251dGVsbGEuZ3VpLnBsYXlsaXN0LlBsYXlsaXN0TWVkaWF0b3I7CitpbXBvcnQgY29tLmxp bWVncm91cC5nbnV0ZWxsYS5ndWkuc2VhcmNoLlNlYXJjaEluZm9ybWF0aW9uOwogaW1wb3J0 IGNvbS5saW1lZ3JvdXAuZ251dGVsbGEuZ3VpLnNlYXJjaC5TZWFyY2hNZWRpYXRvcjsKIGlt cG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLmd1aS50YWJsZXMuQWJzdHJhY3RUYWJsZU1l ZGlhdG9yOwogaW1wb3J0IGNvbS5saW1lZ3JvdXAuZ251dGVsbGEuZ3VpLnRhYmxlcy5Db2x1 bW5QcmVmZXJlbmNlSGFuZGxlcjsKQEAgLTQ4LDkgKzUwLDExIEBACiBpbXBvcnQgY29tLmxp bWVncm91cC5nbnV0ZWxsYS5ndWkudGhlbWVzLlRoZW1lU2V0dGluZ3M7CiBpbXBvcnQgY29t LmxpbWVncm91cC5nbnV0ZWxsYS5ndWkudXRpbC5Db3JlRXhjZXB0aW9uSGFuZGxlcjsKIGlt cG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLnNldHRpbmdzLlF1ZXN0aW9uc0hhbmRsZXI7 CitpbXBvcnQgY29tLmxpbWVncm91cC5nbnV0ZWxsYS5zZXR0aW5ncy5TZWFyY2hTZXR0aW5n czsKIGltcG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLnNldHRpbmdzLlNoYXJpbmdTZXR0 aW5nczsKIGltcG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLnV0aWwuQ29tbW9uVXRpbHM7 CiBpbXBvcnQgY29tLmxpbWVncm91cC5nbnV0ZWxsYS51dGlsLlByb2Nlc3NpbmdRdWV1ZTsK K2ltcG9ydCBjb20ubGltZWdyb3VwLmdudXRlbGxhLnV0aWwuU3RyaW5nVXRpbHM7CiAKIC8q KgogICogVGhpcyBjbGFzcyBhY3RzIGFzIGEgbWVkaWF0b3IgYmV0d2VlbiBhbGwgb2YgdGhl IGNvbXBvbmVudHMgb2YgdGhlCkBAIC0xMDQsNiArMTA4LDggQEAKIAlwcml2YXRlIEFjdGlv biBlZGl0TG9jYXRpb25BY3Rpb247CiAJcHJpdmF0ZSBBY3Rpb24gbWFnbmV0QWN0aW9uOwog CXByaXZhdGUgQWN0aW9uIGJpdHppQWN0aW9uOworICAgIHByaXZhdGUgQWN0aW9uIHNlYXJj aEZpbGVuYW1lOworICAgIHByaXZhdGUgQWN0aW9uIHNlYXJjaEFnYWluOwogCiAgICAgLyoq IFRoZSBhY3R1YWwgZG93bmxvYWQgYnV0dG9ucyBpbnN0YW5jZS4KICAgICAgKi8KQEAgLTE0 NSw2ICsxNTEsOCBAQAogCQllZGl0TG9jYXRpb25BY3Rpb24gPSBuZXcgRWRpdExvY2F0aW9u QWN0aW9uKCk7CiAJCW1hZ25ldEFjdGlvbiA9IG5ldyBDb3B5TWFnbmV0TGlua1RvQ2xpcGJv YXJkQWN0aW9uKHRoaXMpOwogCQliaXR6aUFjdGlvbiA9IG5ldyBCaXR6aUxvb2t1cEFjdGlv bih0aGlzKTsKKyAgICAgICAgc2VhcmNoRmlsZW5hbWUgPSBuZXcgU2VhcmNoRmlsZW5hbWVB Y3Rpb24oKTsKKyAgICAgICAgc2VhcmNoQWdhaW4gPSBuZXcgU2VhcmNoQWdhaW5BY3Rpb24o KTsKICAgICB9CiAKIAkvKioKQEAgLTU1NSw2ICs1NjMsNyBAQAogCQltZW51LmFkZFNlcGFy YXRvcigpOwogCQltZW51LmFkZChuZXcgSk1lbnVJdGVtKGNsZWFyQWN0aW9uKSk7CiAJCW1l bnUuYWRkU2VwYXJhdG9yKCk7CisgICAgICAgIG1lbnUuYWRkKGNyZWF0ZVNlYXJjaE1lbnUo KSk7CiAJCW1lbnUuYWRkKG5ldyBKTWVudUl0ZW0oY2hhdEFjdGlvbikpOwogCQltZW51LmFk ZChuZXcgSk1lbnVJdGVtKGJyb3dzZUFjdGlvbikpOwogCQltZW51LmFkZChuZXcgSk1lbnVJ dGVtKGVkaXRMb2NhdGlvbkFjdGlvbikpOwpAQCAtNTY0LDYgKzU3MywxMyBAQAogCQlyZXR1 cm4gbWVudTsKICAgICB9CiAJCisgICAgcHJpdmF0ZSBKTWVudSBjcmVhdGVTZWFyY2hNZW51 KCkgeworICAgICAgICBKTWVudSBtZW51ID0gbmV3IEpNZW51KEdVSU1lZGlhdG9yLmdldFN0 cmluZ1Jlc291cmNlKCJET1dOTE9BRF9TRUFSQ0hfTUVOVSIpKTsKKyAgICAgICAgbWVudS5h ZGQobmV3IEpNZW51SXRlbShzZWFyY2hBZ2FpbikpOworICAgICAgICBtZW51LmFkZChuZXcg Sk1lbnVJdGVtKHNlYXJjaEZpbGVuYW1lKSk7CisgICAgICAgIHJldHVybiBtZW51OworICAg IH0KKyAgICAKIAlwcml2YXRlIEpNZW51IGNyZWF0ZUFkdmFuY2VkU3ViTWVudSgpIHsKIAkJ Sk1lbnUgbWVudSA9IG5ldyBKTWVudShHVUlNZWRpYXRvci5nZXRTdHJpbmdSZXNvdXJjZQog CQkJCSgiR0VORVJBTF9BRFZBTkNFRF9TVUJfTUVOVSIpKTsKQEAgLTgzMiw0ICs4NDgsNzIg QEAKIAkJfQogCX0KIAorICAgIC8qKiBBY3Rpb24gYWN0aXZhdGVkIHdoZW4gdXNlcnMgd2Fu dHMgdG8gc2VhcmNoIGZvciBmaWxlcyB3aXRoIHRoZQorICAgICAqIHNhbWUgbmFtZSBhcyB0 aGUgZmlsZSB3aGljaCBpcyBiZWluZyBkb3dubG9hZGVkLgorICAgICAqLworICAgIHByaXZh dGUgY2xhc3MgU2VhcmNoRmlsZW5hbWVBY3Rpb24gZXh0ZW5kcyBBYnN0cmFjdEFjdGlvbiB7 CisgICAgICAgIHB1YmxpYyBTZWFyY2hGaWxlbmFtZUFjdGlvbigpIHsKKwkJCXB1dFZhbHVl KEFjdGlvbi5OQU1FLCAKKyAgICAgICAgICAgICAgICAgICAgIEdVSU1lZGlhdG9yLmdldFN0 cmluZ1Jlc291cmNlKCJET1dOTE9BRF9TRUFSQ0hfRklMRU5BTUVfTEFCRUwiKSk7CisJCQlw dXRWYWx1ZShBY3Rpb24uU0hPUlRfREVTQ1JJUFRJT04sIAorICAgICAgICAgICAgICAgICAg ICAgR1VJTWVkaWF0b3IuZ2V0U3RyaW5nUmVzb3VyY2UoIkRPV05MT0FEX1NFQVJDSF9GSUxF TkFNRV9USVAiKSk7CisgICAgICAgIH0KKyAgICAgICAgCisJCXB1YmxpYyB2b2lkIGFjdGlv blBlcmZvcm1lZChBY3Rpb25FdmVudCBlKSB7CisgICAgICAgICAgICBEYXRhTGluZVtdIGxp bmVzID0gVEFCTEUuZ2V0U2VsZWN0ZWREYXRhTGluZXMoKTsKKyAgICAgICAgICAgIGlmICgg bGluZXMubGVuZ3RoID09IDAgKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICAgICAgLy8gZ2V0IG5hbWUgb2YgdGhlIGZpbGUKKyAgICAgICAgICAgIGphdmEubGFuZy5T dHJpbmcgZmlsZW5hbWUgPSAoKERvd25sb2FkRGF0YUxpbmUpIGxpbmVzWzBdKS5nZXRGaWxl TmFtZSgpOworICAgICAgICAgICAgLy8gcmVtb3ZlIGV4dGVuc2lvbiAtIHNlYXJjaGVzIHNl YXJjaGVzIGZpbGVuYW1lIG5vdCBpbiBzcGVjaWZpZWQgZm9ybWF0CisgICAgICAgICAgICBp bnQgZG90UG9zID0gZmlsZW5hbWUubGFzdEluZGV4T2YoJy4nKTsKKyAgICAgICAgICAgIGlm ICggZG90UG9zID4gMCApCisgICAgICAgICAgICAgICAgZmlsZW5hbWUgPSBmaWxlbmFtZS5z dWJzdHJpbmcoIDAsIGRvdFBvcyApOworICAgICAgICAgICAgZmlsZW5hbWUgPSBTdHJpbmdV dGlscy5yZW1vdmVJbGxlZ2FsQ2hhcnMoIGZpbGVuYW1lICk7CisgICAgICAgICAgICAvLyBj dXQgdGhlIGZpbGUgbmFtZSBpZiBuZWNlc3NhcnkKKyAgICAgICAgICAgIGlmICggZmlsZW5h bWUubGVuZ3RoKCkgPiBTZWFyY2hTZXR0aW5ncy5NQVhfUVVFUllfTEVOR1RILmdldFZhbHVl KCkgKQorICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gZmlsZW5hbWUuc3Vic3RyaW5nKDAs IFNlYXJjaFNldHRpbmdzLk1BWF9RVUVSWV9MRU5HVEguZ2V0VmFsdWUoKSk7CisgICAgICAg ICAgICAvLyBzZWFyY2ggaXQgISEKKyAgICAgICAgICAgIEdVSU1lZGlhdG9yLmluc3RhbmNl KCkudHJpZ2dlclNlYXJjaChmaWxlbmFtZSk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAg ICAgIHB1YmxpYyBib29sZWFuIGlzRW5hYmxlZCgpIHsKKyAgICAgICAgICAgIHJldHVybiBU QUJMRS5nZXRTZWxlY3RlZERhdGFMaW5lcygpLmxlbmd0aCA+IDA7CisgICAgICAgIH0KKyAg ICB9CisgICAgCisgICAgLyoqIFRoaXMgYWN0aW9uIGlzIHVzZWQgdG8gcmVwZWF0IG9yZ2lu YWwgc2VhcmNoIHdoaWNoIHdhcyB1c2VkCisgICAgICogdG8gZmluZCB0aGUgZmlsZSB3aGlj aCBpcyBiZWluZyBkb3dubG9hZGVkLgorICAgICAqLworICAgIHByaXZhdGUgY2xhc3MgU2Vh cmNoQWdhaW5BY3Rpb24gZXh0ZW5kcyBBYnN0cmFjdEFjdGlvbiB7CisgICAgICAgIHB1Ymxp YyBTZWFyY2hBZ2FpbkFjdGlvbigpIHsKKwkJCXB1dFZhbHVlKEFjdGlvbi5OQU1FLCAKKyAg ICAgICAgICAgICAgICAgICAgIEdVSU1lZGlhdG9yLmdldFN0cmluZ1Jlc291cmNlKCJET1dO TE9BRF9TRVJBQ0hfT1JHSU5BTF9MQUJFTCIpKTsKKwkJCXB1dFZhbHVlKEFjdGlvbi5TSE9S VF9ERVNDUklQVElPTiwgCisgICAgICAgICAgICAgICAgICAgICBHVUlNZWRpYXRvci5nZXRT dHJpbmdSZXNvdXJjZSgiRE9XTkxPQURfU0VSQUNIX09SR0lOQUxfVElQIikpOworICAgICAg ICB9CisgICAgICAgIAorCQlwdWJsaWMgdm9pZCBhY3Rpb25QZXJmb3JtZWQoQWN0aW9uRXZl bnQgZSkgeworICAgICAgICAgICAgRGF0YUxpbmVbXSBsaW5lcyA9IFRBQkxFLmdldFNlbGVj dGVkRGF0YUxpbmVzKCk7CisgICAgICAgICAgICBpZiAoIGxpbmVzLmxlbmd0aCA9PSAwICkg IC8vIGlzIHRoZXJlIGFueSBmaWxlIHNlbGVjdGVkID8KKyAgICAgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgICAgIC8vIGdldCBvcmdpbmFsIHF1ZXJ5CisgICAgICAgICAgICBE b3dubG9hZGVyIGRvd25sb2FkZXIgPSAoKERvd25sb2FkRGF0YUxpbmUpIGxpbmVzWzBdKS5n ZXREb3dubG9hZGVyKCk7CisgICAgICAgICAgICBNYXAgc2VhcmNoSW5mb01hcCA9IChNYXAp IGRvd25sb2FkZXIuZ2V0QXR0cmlidXRlKAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBTZWFyY2hNZWRpYXRvci5TRUFSQ0hfSU5GT1JNQVRJT05fS0VZ ICk7CisgICAgICAgICAgICBpZiAoIHNlYXJjaEluZm9NYXAgIT0gbnVsbCApIHsgIC8vIGlz IG9yZ2luYWwgcXVlcnkgYXZhaWxhYmxlID8KKyAgICAgICAgICAgICAgICBTZWFyY2hNZWRp YXRvci50cmlnZ2VyU2VhcmNoKCBTZWFyY2hJbmZvcm1hdGlvbi5mcm9tTWFwKCBzZWFyY2hJ bmZvTWFwICkgKTsKKyAgICAgICAgICAgIH0KKwkJfQorICAgICAgICAKKyAgICAgICAgcHVi bGljIGJvb2xlYW4gaXNFbmFibGVkKCkgeworICAgICAgICAgICAgRGF0YUxpbmVbXSBsaW5l cyA9IFRBQkxFLmdldFNlbGVjdGVkRGF0YUxpbmVzKCk7CisgICAgICAgICAgICBpZiAoIGxp bmVzLmxlbmd0aCA8PSAwICkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgICAgICBEb3dubG9hZGVyIGRvd25sb2FkZXIgPSAoKERvd25sb2FkRGF0YUxpbmUpIGxp bmVzWzBdKS5nZXREb3dubG9hZGVyKCk7CisgICAgICAgICAgICByZXR1cm4gZG93bmxvYWRl ci5nZXRBdHRyaWJ1dGUoIFNlYXJjaE1lZGlhdG9yLlNFQVJDSF9JTkZPUk1BVElPTl9LRVkg KSAhPSBudWxsOworICAgICAgICB9CisgICAgfQogfQpJbmRleDogY29tL2xpbWVncm91cC9n bnV0ZWxsYS9ndWkvc2VhcmNoL1NlYXJjaEluZm9ybWF0aW9uLmphdmEKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQpSQ1MgZmlsZTogL2N2cy9ndWkvY29tL2xpbWVncm91cC9nbnV0ZWxsYS9ndWkvc2VhcmNo L1NlYXJjaEluZm9ybWF0aW9uLmphdmEsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOQpkaWZm IC1CIC1iIC11IC1yMS45IFNlYXJjaEluZm9ybWF0aW9uLmphdmEKLS0tIGNvbS9saW1lZ3Jv dXAvZ251dGVsbGEvZ3VpL3NlYXJjaC9TZWFyY2hJbmZvcm1hdGlvbi5qYXZhCTIxIEp1biAy MDA1IDIxOjQzOjU5IC0wMDAwCTEuOQorKysgY29tL2xpbWVncm91cC9nbnV0ZWxsYS9ndWkv c2VhcmNoL1NlYXJjaEluZm9ybWF0aW9uLmphdmEJMTcgSnVsIDIwMDUgMjE6MjU6MjYgLTAw MDAKQEAgLTMsNiArMyw4IEBACiBpbXBvcnQgamF2YS5uZXQuSW5ldEFkZHJlc3M7CiBpbXBv cnQgamF2YS5uZXQuVW5rbm93bkhvc3RFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLlN0 cmluZ1Rva2VuaXplcjsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRp bC5IYXNoTWFwOwogCiBpbXBvcnQgY29tLmxpbWVncm91cC5nbnV0ZWxsYS5NZWRpYVR5cGU7 CiBpbXBvcnQgY29tLmxpbWVncm91cC5nbnV0ZWxsYS5ndWkuR1VJTWVkaWF0b3I7CkBAIC0x Miw2ICsxNCwxNyBAQAogICogU2ltcGxlIHN0cnVjdC1saWtlIGNsYXNzIGNvbnRhaW5pbmcg aW5mb3JtYXRpb24gYWJvdXQgYSBzZWFyY2guCiAgKi8KIHB1YmxpYyBjbGFzcyBTZWFyY2hJ bmZvcm1hdGlvbiB7CisgICAgLyoqIENvbnN0YW50cyB1c2VkIHRvIHNlcmlhbGl6ZSB0aGUg c2VhcmNoIGluZm9ybWF0aW9uIHRvIE1hcC4gKi8KKyAgICAvKiogS2V5IGluIG1hcCB3aGlj aCBob2xkcyBwcm9wZXJ0eSB7QGxpbmsgI3R5cGV9LiAqLworICAgIHByaXZhdGUgc3RhdGlj IGZpbmFsIFN0cmluZyBNQVBfVFlQRSAgPSAidHlwZSI7CisgICAgLyoqIEtleSBpbiBtYXAg d2hpY2ggaG9sZHMgcHJvcGVydHkge0BsaW5rICNxdWVyeX0uICovCisgICAgcHJpdmF0ZSBz dGF0aWMgZmluYWwgU3RyaW5nIE1BUF9RVUVSWSA9ICJxdWVyeSI7CisgICAgLyoqIEtleSBp biBtYXAgd2hpY2ggaG9sZHMgcHJvcGVydHkge0BsaW5rICN4bWx9LiAqLworICAgIHByaXZh dGUgc3RhdGljIGZpbmFsIFN0cmluZyBNQVBfWE1MICAgPSAieG1sIjsKKyAgICAvKiogS2V5 IGluIG1hcCB3aGljaCBob2xkcyBwcm9wZXJ0eSB7QGxpbmsgI21lZGlhfS4gKi8KKyAgICBw cml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUFQX01FRElBID0gIm1lZGlhIjsKKyAgICAv KiogS2V5IGluIG1hcCB3aGljaCBob2xkcyBwcm9wZXJ0eSB7QGxpbmsgI3RpdGxlfS4gKi8K KyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUFQX1RJVExFID0gInRpdGxlIjsK ICAgICAKICAgICAvKioKICAgICAgKiBBIGtleXdvcmQgc2VhcmNoLgpAQCAtODIsNiArOTUs MzEgQEAKIAl9CiAgICAgCiAgICAgLyoqCisgICAgICogQ3JlYXRlcyBhIG5ldyBrZXl3b3Jk LCBidXQgc3RhdGUgaXMgbG9hZGVkIGZyb20gTWFwIGdlbmVyYXRlZAorICAgICAqIGJ5IHtA bGluayB0b01hcCgpfS4KKyAgICAgKiBAcGFyYW0gbWFwIFRoZSBtYXAgd2l0aCBzdG9ycmVk IHN0YXRlLgorICAgICAqIEBzZWUgdG9NYXAoKQorICAgICAqIEBzZWUgZnJvbU1hcChNYXAp CisgICAgICovCisgICAgcHJpdmF0ZSBTZWFyY2hJbmZvcm1hdGlvbihNYXAgbWFwKSB7Cisg ICAgICAgIEludGVnZXIgdHlwZSA9IChJbnRlZ2VyKSBtYXAuZ2V0KE1BUF9UWVBFKTsKKyAg ICAgICAgaWYgKCB0eXBlID09IG51bGwgKQorICAgICAgICAgICAgdGhyb3cgbmV3IE51bGxQ b2ludGVyRXhjZXB0aW9uKCJudWxsIHR5cGUiKTsKKyAgICAgICAgdGhpcy50eXBlID0gdHlw ZS5pbnRWYWx1ZSgpOworCisgICAgICAgIHF1ZXJ5ID0gKFN0cmluZykgbWFwLmdldChNQVBf UVVFUlkpOworICAgICAgICB4bWwgICA9IChTdHJpbmcpIG1hcC5nZXQoTUFQX1hNTCk7Cisg ICAgICAgIG1lZGlhID0gKE1lZGlhVHlwZSkgbWFwLmdldChNQVBfTUVESUEpOworICAgICAg ICB0aXRsZSA9IChTdHJpbmcpIG1hcC5nZXQoTUFQX1RJVExFKTsKKworICAgICAgICBpZiht ZWRpYSA9PSBudWxsKQorICAgICAgICAgICAgdGhyb3cgbmV3IE51bGxQb2ludGVyRXhjZXB0 aW9uKCJudWxsIG1lZGlhIik7CisgICAgICAgIGlmKHF1ZXJ5ID09IG51bGwpCisgICAgICAg ICAgICB0aHJvdyBuZXcgTnVsbFBvaW50ZXJFeGNlcHRpb24oIm51bGwgcXVlcnkiKTsKKyAg ICB9CisgICAgCisgICAgCisgICAgLyoqCiAgICAgICogQ3JlYXRlcyBhIGtleXdvcmQgc2Vh cmNoLgogICAgICAqLwogICAgIHB1YmxpYyBzdGF0aWMgU2VhcmNoSW5mb3JtYXRpb24gY3Jl YXRlS2V5d29yZFNlYXJjaChTdHJpbmcgcXVlcnksCkBAIC0yMDIsNSArMjQwLDMzIEBACiAg ICAgICovCiAgICAgcHVibGljIGJvb2xlYW4gaXNCcm93c2VIb3N0U2VhcmNoKCkgewogICAg ICAgICByZXR1cm4gdHlwZSA9PSBCUk9XU0VfSE9TVDsKKyAgICB9CisgICAgCisgICAgLyoq CisgICAgICogQ29udmVydHMgc3RhdGUgc3RvcnJlZCBpbiB0aGUgb2JqZWN0IGludG8gbWFw LiBJbiB0aGlzIHdheSwgc3RhdGUKKyAgICAgKiBjYW4gYmUgc3RvcnJlZCBpbiBjbGFzc2Vz IHVuYXdyZSBvZiB0aGlzIGNsYXNzIGV4aXN0YW5jZS4KKyAgICAgKiBAcmV0dXJuIEEgbWFw IHdoaWNoIGhvbGRzIHBhcmFtZXRlcnMgb2YgdGhlIGNsYXNzLgorICAgICAqIEBzZWUgZnJv bU1hcCgpCisgICAgICogQHNlZSBTZWFyY2hJbmZvcm1hdGlvbihNYXApCisgICAgICovCisg ICAgcHVibGljIE1hcCB0b01hcCgpIHsKKyAgICAgICAgTWFwIG1hcCA9IG5ldyBIYXNoTWFw KCk7CisgICAgICAgIG1hcC5wdXQoTUFQX1RZUEUsIG5ldyBJbnRlZ2VyKHR5cGUpKTsKKyAg ICAgICAgbWFwLnB1dChNQVBfUVVFUlksIHF1ZXJ5KTsKKyAgICAgICAgbWFwLnB1dChNQVBf WE1MLCB4bWwpOworICAgICAgICBtYXAucHV0KE1BUF9NRURJQSwgbWVkaWEpOworICAgICAg ICBtYXAucHV0KE1BUF9USVRMRSwgdGl0bGUpOworICAgICAgICByZXR1cm4gbWFwOworICAg IH0KKworICAgIC8qKgorICAgICAqIENyZWF0ZXMgYSBuZXcga2V5d29yZCwgYnV0IHN0YXRl IGlzIGxvYWRlZCBmcm9tIE1hcCBnZW5lcmF0ZWQKKyAgICAgKiBieSB7QGxpbmsgdG9NYXAo KX0uCisgICAgICogQHBhcmFtIG1hcCBUaGUgbWFwIHdpdGggc3RvcnJlZCBzdGF0ZS4KKyAg ICAgKiBAc2VlIHRvTWFwKCkKKyAgICAgKiBAc2VlIFNlYXJjaEluZm9ybWF0aW9uKE1hcCkK KyAgICAgKi8KKyAgICBwdWJsaWMgc3RhdGljIFNlYXJjaEluZm9ybWF0aW9uIGZyb21NYXAo TWFwIG1hcCkgeworICAgICAgICByZXR1cm4gbmV3IFNlYXJjaEluZm9ybWF0aW9uKG1hcCk7 CiAgICAgfQogfQpJbmRleDogY29tL2xpbWVncm91cC9nbnV0ZWxsYS9ndWkvc2VhcmNoL1Nl YXJjaE1lZGlhdG9yLmphdmEKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9ndWkvY29t L2xpbWVncm91cC9nbnV0ZWxsYS9ndWkvc2VhcmNoL1NlYXJjaE1lZGlhdG9yLmphdmEsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuOTMKZGlmZiAtQiAtYiAtdSAtcjEuOTMgU2VhcmNoTWVk aWF0b3IuamF2YQotLS0gY29tL2xpbWVncm91cC9nbnV0ZWxsYS9ndWkvc2VhcmNoL1NlYXJj aE1lZGlhdG9yLmphdmEJMSBKdWwgMjAwNSAyMDowNDoxMCAtMDAwMAkxLjkzCisrKyBjb20v bGltZWdyb3VwL2dudXRlbGxhL2d1aS9zZWFyY2gvU2VhcmNoTWVkaWF0b3IuamF2YQkxNyBK dWwgMjAwNSAyMToyNToyNyAtMDAwMApAQCAtODUsNiArODUsOSBAQAogICAgIHN0YXRpYyBm aW5hbCBTdHJpbmcgQkxPQ0tfU1RSSU5HID0KICAgICAgICAgR1VJTWVkaWF0b3IuZ2V0U3Ry aW5nUmVzb3VyY2UoIlNFQVJDSF9QVUJMSUNfQkxPQ0tfU1RSSU5HIik7CiAKKyAgICAvKiog QSBuYW1lIG9mIGF0dHJpYnV0ZSwgd2hpY2ggaG9sZHMgYSBxdWVyeSBpbiBzdGF0ZSBvZiBk b3dubG9hZGVkIGZpbGUuICovCisgICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgU0VB UkNIX0lORk9STUFUSU9OX0tFWSA9ICJzZWFyY2hJbmZvcm1hdGlvbk1hcCI7CisKICAgICAv KioKICAgICAgKiBWYXJpYWJsZSBmb3IgdGhlIGNvbXBvbmVudCB0aGF0IGhhbmRsZXMgYWxs IHNlYXJjaCBpbnB1dCBmcm9tIHRoZSB1c2VyLgogICAgICAqLwpAQCAtNDUzLDcgKzQ1Niw4 IEBACiAgICAgICAgIGZpbmFsIFRhYmxlTGluZVtdIGxpbmVzID0gcnAuZ2V0QWxsU2VsZWN0 ZWRMaW5lcygpOwogICAgICAgICBTd2luZ1V0aWxpdGllcy5pbnZva2VMYXRlcihuZXcgUnVu bmFibGUoKSB7CiAgICAgICAgICAgICBwdWJsaWMgdm9pZCBydW4oKSB7Ci0gICAgICAgICAg ICAgICAgU2VhcmNoTWVkaWF0b3IuZG93bmxvYWRBbGwobGluZXMsIG5ldyBHVUlEKHJwLmdl dEdVSUQoKSkpOworICAgICAgICAgICAgICAgIFNlYXJjaE1lZGlhdG9yLmRvd25sb2FkQWxs KGxpbmVzLCBuZXcgR1VJRChycC5nZXRHVUlEKCkpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJwLmdldFNlYXJjaEluZm9ybWF0aW9uKCkpOwogICAg ICAgICAgICAgICAgIHJwLnJlZnJlc2goKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSk7 CkBAIC00NzEsMTUgKzQ3NSwxOCBAQAogCQlpZiAobGluZXMubGVuZ3RoICE9IDEpIHsKIAkJ CXRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oIlRoZXJlIHNob3VsZCBvbmx5IGJl IG9uZSBzZWFyY2ggcmVzdWx0IHNlbGVjdGVkIik7CiAJCX0KLQkJZG93bmxvYWRMaW5lKGxp bmVzWzBdLCBuZXcgR1VJRChwYW5lbC5nZXRHVUlEKCkpLCBudWxsLCBudWxsLCB0cnVlKTsK KwkJZG93bmxvYWRMaW5lKGxpbmVzWzBdLCBuZXcgR1VJRChwYW5lbC5nZXRHVUlEKCkpLCBu dWxsLCBudWxsLCB0cnVlLAorICAgICAgICAgICAgICAgICAgICAgcGFuZWwuZ2V0U2VhcmNo SW5mb3JtYXRpb24oKSk7CiAJfQogCiAgICAgLyoqCiAgICAgICogRG93bmxvYWRzIGFsbCB0 aGUgc2VsZWN0ZWQgbGluZXMuCiAgICAgICovCi0gICAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBk b3dubG9hZEFsbChUYWJsZUxpbmVbXSBsaW5lcywgR1VJRCBndWlkKSB7CisgICAgcHJpdmF0 ZSBzdGF0aWMgdm9pZCBkb3dubG9hZEFsbChUYWJsZUxpbmVbXSBsaW5lcywgR1VJRCBndWlk LCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNlYXJjaEluZm9ybWF0 aW9uIHNlYXJjaEluZm8pIAorICAgIHsKICAgICAgICAgZm9yKGludCBpID0gMDsgaSA8IGxp bmVzLmxlbmd0aDsgaSsrKQotICAgICAgICAgICAgZG93bmxvYWRMaW5lKGxpbmVzW2ldLCBn dWlkLCBudWxsLCBudWxsLCBmYWxzZSk7CisgICAgICAgICAgICBkb3dubG9hZExpbmUobGlu ZXNbaV0sIGd1aWQsIG51bGwsIG51bGwsIGZhbHNlLCBzZWFyY2hJbmZvKTsKICAgICB9CiAg ICAgCiAgICAgLyoqCkBAIC00OTAsOSArNDk3LDExIEBACiAgICAgICogc2F2ZWQgdG8sIGNh biBiZSA8Y29kZT5udWxsPC9jb2RlPgogICAgICAqIEBwYXJhbSBmaWxlTmFtZSB0aGUgb3B0 aW9uYWwgZmlsZW5hbWUgb2YgdGhlIGZpbmFsIGZpbGUsIGNhbiBiZQogICAgICAqIDxjb2Rl Pm51bGw8L2NvZGU+CisgICAgICogQHBhcmFtIHNlYXJjaEluZm8gVGhlIHF1ZXJ5IHVzZWQg dG8gZmluZCB0aGUgZmlsZSBiZWluZyBkb3dubG9hZGVkLgogICAgICAqLwogICAgIHByaXZh dGUgc3RhdGljIHZvaWQgZG93bmxvYWRMaW5lKFRhYmxlTGluZSBsaW5lLCBHVUlEIGd1aWQs IEZpbGUgc2F2ZURpciwKLQkJCVN0cmluZyBmaWxlTmFtZSwgYm9vbGVhbiBzYXZlQXMpIHsK KwkJCVN0cmluZyBmaWxlTmFtZSwgYm9vbGVhbiBzYXZlQXMsIFNlYXJjaEluZm9ybWF0aW9u IHNlYXJjaEluZm8pIAorICAgIHsKICAgICAgICAgaWYgKGxpbmUgPT0gbnVsbCkKICAgICAg ICAgICAgIHRocm93IG5ldyBOdWxsUG9pbnRlckV4Y2VwdGlvbigiVHJpZWQgdG8gZG93bmxv YWQgbnVsbCBsaW5lIik7CiAgICAgICAgIApAQCAtNTQyLDE4ICs1NTEsMjEgQEAKIAkJCX0K IAkJfQogCi0gICAgICAgIGRvd25sb2FkV2l0aE92ZXJ3cml0ZVByb21wdChyZmRzLCBvdGhl clJGRHMsIGd1aWQsIHNhdmVEaXIsIGZpbGVOYW1lLCBzYXZlQXMpOworICAgICAgICBkb3du bG9hZFdpdGhPdmVyd3JpdGVQcm9tcHQocmZkcywgb3RoZXJSRkRzLCBndWlkLCBzYXZlRGly LCBmaWxlTmFtZSwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzYXZl QXMsIHNlYXJjaEluZm8pOwogICAgIH0KIAogICAgIC8qKgogICAgICAqIERvd25sb2FkcyB0 aGUgZ2l2ZW4gZmlsZXMsIHByb21wdGluZyB0aGUgdXNlciBpZiB0aGUgZmlsZSBhbHJlYWR5 IGV4aXN0cy4KICAgICAgKiBAcGFyYW0gcXVlcnlHVUlEIHRoZSBndWlkIG9mIHRoZSBxdWVy eSB5b3UgYXIgZG93bmxvYWRpbmcgcmZkcyBmb3IuCisgICAgICogQHBhcmFtIHNlYXJjaElu Zm8gVGhlIHF1ZXJ5IHVzZWQgdG8gZmluZCB0aGUgZmlsZSBiZWluZyBkb3dubG9hZGVkLgog ICAgICAqLwogICAgIHByaXZhdGUgc3RhdGljIHZvaWQgZG93bmxvYWRXaXRoT3ZlcndyaXRl UHJvbXB0KFJlbW90ZUZpbGVEZXNjW10gcmZkcywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMaXN0IGFsdHMsIEdVSUQgcXVlcnlHVUlE LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEZpbGUgc2F2ZURpciwgU3RyaW5nIGZpbGVOYW1lLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2xlYW4gc2F2ZUFzKSB7Ci0gICAg ICAgIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJvb2xlYW4gc2F2ZUFzLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBTZWFyY2hJbmZvcm1hdGlvbiBzZWFyY2hJbmZvKSAKKyAg ICB7CiAgICAgICAgIGlmIChyZmRzLmxlbmd0aCA8IDEpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIGlmIChjb250YWluc0V4ZShyZmRzKSkgewpAQCAtNTg5LDYgKzYwMSw3IEBA CiAJCQkJOiBEb3dubG9hZGVyVXRpbHMuY3JlYXRlRG93bmxvYWRlcihmYWN0b3J5KTsKIAkJ aWYgKGRsICE9IG51bGwpIHsKIAkJCXNldEFzRG93bmxvYWRpbmcocmZkcyk7CisgICAgICAg ICAgICBkbC5zZXRBdHRyaWJ1dGUoU0VBUkNIX0lORk9STUFUSU9OX0tFWSwgc2VhcmNoSW5m by50b01hcCgpKTsKIAkJfQogICAgIH0KIAo= --------------060806020504080009010707 Content-Type: text/plain; name="search_messagebundles.txt" Content-Disposition: inline; filename="search_messagebundles.txt" Content-Transfer-Encoding: base64 SW5kZXg6IE1lc3NhZ2VzQnVuZGxlLnByb3BlcnRpZXMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2N2cy9saWIvbWVzc2FnZWJ1bmRsZXMvTWVzc2FnZXNCdW5kbGUucHJvcGVydGllcyx2 CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMzQKZGlmZiAtQiAtYiAtdSAtcjEuMjM0IE1lc3Nh Z2VzQnVuZGxlLnByb3BlcnRpZXMKLS0tIE1lc3NhZ2VzQnVuZGxlLnByb3BlcnRpZXMJOCBK dWwgMjAwNSAyMToyOTowNyAtMDAwMAkxLjIzNAorKysgTWVzc2FnZXNCdW5kbGUucHJvcGVy dGllcwkxNyBKdWwgMjAwNSAyMToyOTowNiAtMDAwMApAQCAtNjkzLDYgKzY5MywxMiBAQAog RE9XTkxPQURfUFJJT1JJVFlfRE9XTl9CVVRUT05fVElQPU1vdmUgdGhlIFNlbGVjdGVkIERv d25sb2FkIEZ1cnRoZXIgZnJvbSBCZWNvbWluZyBBY3RpdmUKIERPV05MT0FEX1BSSU9SSVRZ X1BSSU9SSVRJWkU9UXVldWUKIERPV05MT0FEX1NIT1dfRklSU1RfRE9XTkxPQURfV0FSTklO Rz1MaW1lV2lyZSBpcyB1bmFibGUgdG8gZmluZCBhIGxpY2Vuc2UgZm9yIHRoaXMgZmlsZS4g RG93bmxvYWQgYW55d2F5P1xuXG5QbGVhc2Ugbm90ZTogTGltZVdpcmUgY2Fubm90IG1vbml0 b3Igb3IgY29udHJvbCB0aGUgY29udGVudCBvZiB0aGUgR251dGVsbGEgbmV0d29yay4gUGxl YXNlIHJlc3BlY3QgeW91ciBsb2NhbCBjb3B5cmlnaHQgbGF3cy4KK0RPV05MT0FEX1NFQVJD SF9NRU5VPVNlYXJjaC4uLgorRE9XTkxPQURfU0VBUkNIX0ZJTEVOQU1FX0xBQkVMPUZpbGVz IHdpdGggdGhpcyBuYW1lCitET1dOTE9BRF9TRUFSQ0hfRklMRU5BTUVfVElQPVNlYXJjaGVz IGZvciBmaWxlcyB3aXRoIHRoZSBzYW1lIGZpbGUgbmFtZS4KK0RPV05MT0FEX1NFUkFDSF9P UkdJTkFMX0xBQkVMPU9yZ2luYWwgcXVlcnkKK0RPV05MT0FEX1NFUkFDSF9PUkdJTkFMX1RJ UD1QZXJmb3JtcyB0aGUgc2FtZSBzZWFyY2ggYXMgdGhlIG9uZSB3aGljaCBmb3VuZCB0aGlz IGZpbGUgcHJldmlvdXNseS4KKwogCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAjIEtleS92YWx1ZSBwYWly cyBmb3IgVXBsb2FkVmlldwpJbmRleDogTWVzc2FnZXNCdW5kbGVfcGwuVVRGLTgudHh0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvbGliL21lc3NhZ2VidW5kbGVzL01lc3NhZ2Vz QnVuZGxlX3BsLlVURi04LnR4dCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS42NwpkaWZmIC1C IC1iIC11IC1yMS42NyBNZXNzYWdlc0J1bmRsZV9wbC5VVEYtOC50eHQKLS0tIE1lc3NhZ2Vz QnVuZGxlX3BsLlVURi04LnR4dAk5IEp1bCAyMDA1IDAyOjAwOjI4IC0wMDAwCTEuNjcKKysr IE1lc3NhZ2VzQnVuZGxlX3BsLlVURi04LnR4dAkxNyBKdWwgMjAwNSAyMToyOToxNCAtMDAw MApAQCAtMTE5NSw2ICsxMTk1LDE3IEBACiAjPyBET1dOTE9BRF9QUklPUklUWV9QUklPUklU SVpFPQogIyMjIyBET1dOTE9BRF9TSE9XX0ZJUlNUX0RPV05MT0FEX1dBUk5JTkc9TGltZVdp cmUgaXMgdW5hYmxlIHRvIGZpbmQgYSBsaWNlbnNlIGZvciB0aGlzIGZpbGUuIERvd25sb2Fk IGFueXdheT9cblxuUGxlYXNlIG5vdGU6IExpbWVXaXJlIGNhbm5vdCBtb25pdG9yIG9yIGNv bnRyb2wgdGhlIGNvbnRlbnQgb2YgdGhlIEdudXRlbGxhIG5ldHdvcmsuIFBsZWFzZSByZXNw ZWN0IHlvdXIgbG9jYWwgY29weXJpZ2h0IGxhd3MuCiAjPyBET1dOTE9BRF9TSE9XX0ZJUlNU X0RPV05MT0FEX1dBUk5JTkc9CisjIyMjIERPV05MT0FEX1NFQVJDSF9NRU5VPVNlYXJjaC4u LgorRE9XTkxPQURfU0VBUkNIX01FTlU9U3p1a2FqLi4uCisjIyMjIERPV05MT0FEX1NFQVJD SF9GSUxFTkFNRV9MQUJFTD1GaWxlcyB3aXRoIHRoaXMgbmFtZQorRE9XTkxPQURfU0VBUkNI X0ZJTEVOQU1FX0xBQkVMPVBsaWvDs3cgbyB0ZWogbmF6d2llCisjIyMjIERPV05MT0FEX1NF QVJDSF9GSUxFTkFNRV9USVA9U2VhcmNoZXMgZm9yIGZpbGVzIHdpdGggdGhlIHNhbWUgZmls ZSBuYW1lLgorRE9XTkxPQURfU0VBUkNIX0ZJTEVOQU1FX1RJUD1XeXN6dWt1amUgcGxpa8Oz dyBvIHRlaiBzYW1laiBuYXp3aWUuCisjIyMjIERPV05MT0FEX1NFUkFDSF9PUkdJTkFMX0xB QkVMPU9yZ2luYWwgcXVlcnkKK0RPV05MT0FEX1NFUkFDSF9PUkdJTkFMX0xBQkVMPU9yZ2lu YWxuZSB6YXB5dGFuaWUKKyMjIyMgRE9XTkxPQURfU0VSQUNIX09SR0lOQUxfVElQPVBlcmZv cm1zIHRoZSBzYW1lIHNlYXJjaCBhcyB0aGUgb25lIHdoaWNoIGZvdW5kIHRoaXMgZmlsZSBw cmV2aW91c2x5LgorRE9XTkxPQURfU0VSQUNIX09SR0lOQUxfVElQPVd5a29udWplIHRvIHNh bW8gemFweXRhbmllLCBrdMOzcmUgd2N6ZcWbbmllaiBvZG5hbGF6xYJvIHRlbiBwbGlrLgor CiAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMKICMgS2V5L3ZhbHVlIHBhaXJzIGZvciBVcGxvYWRWaWV3Cg== --------------060806020504080009010707 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 7bit _______________________________________________ gui-dev mailing list [email protected] http://www.limewire.org/mailman/listinfo/gui-dev --------------060806020504080009010707--