94812 2012-08-23 07:31:12 -0700 Web Inspector: register context menu providers for lazily loaded panels. 2012-08-23 07:58:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 702966 0 pfeldman 2012-08-23 07:31:12 -0700 Panel descriptors now register providers that lazily load panels on demand. 702978 1 160161 pfeldman 2012-08-23 07:46:16 -0700 Created attachment 160161 Patch 702986 2 160161 apavlov 2012-08-23 07:53:07 -0700 Comment on attachment 160161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160161&action=review Please fix the copyright years in the new files, looks good otherwise > Source/WebCore/inspector/front-end/NetworkPanelDescriptor.js:4 > + * Copyright (C) 2011 Google Inc. All rights reserved. 2012 > Source/WebCore/inspector/front-end/ScriptsPanelDescriptor.js:3 > + * Copyright (C) 2011 Google Inc. All rights reserved. 2012 702991 3 pfeldman 2012-08-23 07:58:54 -0700 Committed r126425: <http://trac.webkit.org/changeset/126425> 160161 2012-08-23 07:46:16 -0700 2012-08-23 07:53:06 -0700 Patch bug-94812-20120823184612.patch text/plain 21215 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3MjkyM2JiMGM0NDk5 ZTNlNDUzMTNkOGRkMWZhNDAxOWRkZjU5ZC4uY2I2ZTZjMGE5M2E0Y2FiZjNmYmViY2M3ODQyMWRi ZWE3OWMwNzUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA4LTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlZ2lzdGVyIGNvbnRleHQgbWVudSBwcm92aWRlcnMgZm9yIGxhemlseSBsb2FkZWQgcGFu ZWxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4 MTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIFBh bmVsIGRlc2NyaXB0b3JzIG5vdyByZWdpc3RlciBwcm92aWRlcnMgdGhhdCBsYXppbHkgbG9hZCBw YW5lbHMgb24gZGVtYW5kLgorICAgICAgICAtIFJlbW92ZWQgY3VzdG9tIHByb2ZpbGVzIGNvbnRl eHQgcHJvdmlkZXIgaW5mcmFzdHJ1Y3R1cmUgaW4gZmF2b3Igb2YgZ2VuZXJpYyBvbmUuCisKKyAg ICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52 Y3Byb2o6CisgICAgICAgICogaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5OgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtQYW5lbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWxEZXNjcmlwdG9yLmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3 b3JrUGFuZWxEZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWxE ZXNjcmlwdG9yLnByb3RvdHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9jb250ZXh0TWVu dUV2ZW50RmlyZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcmVwb3J0SGVhcFNuYXBzaG90UHJv Z3Jlc3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLmFw cGVuZEFwcGxpY2FibGVJdGVtcy5kaWRSZWNlaXZlSGVhcE9iamVjdElkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWxEZXNjcmlwdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZS5hcHBlbmRBcHBsaWNhYmxlSXRlbXMpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9wYW5lbERlc2NyaXB0b3Jz KToKKwogMjAxMi0wOC0yMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1ha2UgZGlzdGNoZWNrLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5n eXBpCmluZGV4IDhmYzU3ODY4NjllZTczMDg2NzY4MWYyYjViOTA1NjhjZWEzYTUwYTQuLmY2Mjlk ZTk2NDI1MDJlMjE5Njc2MjYwMjE2ZThmYWEwN2M0NGQwODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAg LTYzNDAsNiArNjM0MCw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRp dmVCcmVha3BvaW50c1NpZGViYXJQYW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtMb2cuanMnLAorICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsRGVzY3JpcHRvci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrUmVxdWVzdC5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9P YmplY3QuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UG9wb3Zl ckhlbHBlci5qcycsCkBAIC02MzYzLDYgKzYzNjQsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0Rm9ybWF0dGVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlcldvcmtlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMnLAorICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5qcycsCiAgICAgICAgICAgICAn aW5zcGVjdG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzJywKICAgICAgICAgICAgICdp bnNwZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5qcycsCiAgICAgICAgICAgICAnaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qcycsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDkwNTYxYTdhYTg2YjM4ZDI1M2EyNTgz OTA2OTEzMjBkMjgzNGIxYzQuLmY1N2UwY2I2MjNmMzFmYTExMWZmNzhkNDZhY2UzZTdhZjg0MmVi MmMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNw cm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBA IC03NjE2Niw2ICs3NjE2NiwxMCBAQAogCQkJCQk+CiAJCQkJPC9GaWxlPgogCQkJCTxGaWxlCisJ CQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxOZXR3b3JrUGFuZWxEZXNj cmlwdG9yLmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZl UGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxOZXR3b3JrUmVxdWVzdC5qcyIKIAkJCQkJPgog CQkJCTwvRmlsZT4KQEAgLTc2MzYyLDYgKzc2MzY2LDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+ CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFNj cmlwdHNQYW5lbERlc2NyaXB0b3IuanMiCisJCQkJCT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZpbGUK IAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFNjcmlwdHNTZWFyY2hT Y29wZS5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9jb21waWxlLWZyb250LWVuZC5weQppbmRleCA0NDkxMzE5MzY2MzhiNmUzMTJhYmQ5NDRiOGUz YTI2OGZiMjIxM2YzLi5mMzE0ZWFkNDQzYTM5NjQ1NzY0NjFhOWFhYWQ3NjM3MzRkOTJlZjM5IDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CkBAIC0x OTcsNiArMTk3LDcgQEAgbW9kdWxlcyA9IFsKICAgICAgICAgICAgICJSZXNvdXJjZVZpZXcuanMi LAogICAgICAgICAgICAgIlJlc291cmNlV2ViU29ja2V0RnJhbWVWaWV3LmpzIiwKICAgICAgICAg ICAgICJOZXR3b3JrUGFuZWwuanMiLAorICAgICAgICAgICAgIk5ldHdvcmtQYW5lbERlc2NyaXB0 b3IuanMiLAogICAgICAgICBdCiAgICAgfSwKICAgICB7CkBAIC0yMjksNiArMjMwLDcgQEAgbW9k dWxlcyA9IFsKICAgICAgICAgICAgICJTY29wZUNoYWluU2lkZWJhclBhbmUuanMiLAogICAgICAg ICAgICAgIlNjcmlwdHNOYXZpZ2F0b3IuanMiLAogICAgICAgICAgICAgIlNjcmlwdHNQYW5lbC5q cyIsCisgICAgICAgICAgICAiU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5qcyIsCiAgICAgICAgICAg ICAiU2NyaXB0c1NlYXJjaFNjb3BlLmpzIiwKICAgICAgICAgICAgICJTbmlwcGV0SmF2YVNjcmlw dFNvdXJjZUZyYW1lLmpzIiwKICAgICAgICAgICAgICJTdHlsZVNoZWV0T3V0bGluZURpYWxvZy5q cyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1Bh bmVsLmpzCmluZGV4IDY5N2ZkMGQyNGZkN2I1N2E3YTg2MDNhMGU3NDVmM2EyMWZhNGIxMDQuLjZh YTVmYzkzNWJlNTA0MzJhOGRkNjYxNTYyZTA4OGNiMThmNThhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC0xMzA4LDcg KzEzMDgsNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsID0gZnVuY3Rpb24oKQogICAgICAg ICByZXR1cm4gdGhpcy52aXNpYmxlVmlldzsKICAgICB9CiAgICAgV2ViSW5zcGVjdG9yLkdvVG9M aW5lRGlhbG9nLmluc3RhbGwodGhpcywgdmlld0dldHRlci5iaW5kKHRoaXMpKTsKLSAgICBXZWJJ bnNwZWN0b3IuQ29udGV4dE1lbnUucmVnaXN0ZXJQcm92aWRlcih0aGlzKTsKIH0KIAogV2ViSW5z cGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbERlc2NyaXB0b3IuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbERlc2NyaXB0b3IuanMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYzNiODBkMGMxZjRkNGQzMDU2NzJjYjlkOGY0MjViNDgzMjA0ZGFmOQotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1BhbmVsRGVzY3JpcHRvci5qcwpAQCAtMCwwICsxLDU1IEBACisvKgorICogQ29weXJpZ2h0IChD KSAyMDA3LCAyMDA4IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMDgsIDIwMDkgQW50aG9ueSBSaWNhdWQgPHJpa0B3ZWJraXQub3JnPgorICogQ29w eXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKgorICogMS4gIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKiAzLiAgTmVpdGhlciB0aGUgbmFtZSBvZiBBcHBsZSBDb21wdXRlciwgSW5j LiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgorICogICAgIGl0cyBjb250cmlidXRvcnMgbWF5 IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKKyAqICAgICBm cm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Np b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENP TlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKKyAqIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVS UE9TRSBBUkUKKyAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBD T05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyAqIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCisgKiAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7CisgKiBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQKKyAqIE9OIEFOWSBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworLyoqCisgKiBA Y29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUGFuZWxEZXNjcmlwdG9yfQor ICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db250ZXh0TWVudS5Qcm92aWRlcn0KKyAqLwor V2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbERlc2NyaXB0b3IgPSBmdW5jdGlvbigpCit7CisgICAg V2ViSW5zcGVjdG9yLlBhbmVsRGVzY3JpcHRvci5jYWxsKHRoaXMsICJuZXR3b3JrIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJOZXR3b3JrIiksICJOZXR3b3JrUGFuZWwiLCAiTmV0d29ya1BhbmVs LmpzIik7CisgICAgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LnJlZ2lzdGVyUHJvdmlkZXIodGhp cyk7Cit9CisKK1dlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZSA9 IHsKKyAgICAvKiogCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNv bnRleHRNZW51CisgICAgICogQHBhcmFtIHtPYmplY3R9IHRhcmdldAorICAgICAqLworICAgIGFw cGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oY29udGV4dE1lbnUsIHRhcmdldCkKKyAgICB7 CisgICAgICAgIGlmICghKHRhcmdldCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OZXR3b3JrUmVx dWVzdCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMucGFuZWwoKS5hcHBlbmRB cHBsaWNhYmxlSXRlbXMoY29udGV4dE1lbnUsIHRhcmdldCk7CisgICAgfQorfQorCitXZWJJbnNw ZWN0b3IuTmV0d29ya1BhbmVsRGVzY3JpcHRvci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLlBhbmVsRGVzY3JpcHRvci5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5q cwppbmRleCBlYTNiNDQ4NTNkZTE0MTc1NmU5ZTE2YWM4YWRjZmVjNTI4MjFkOGFjLi5mMWM1MDY5 ZDc5OWNiYTJhNTQ0NDI0ZDdlZDY1MDRlNjcxYmU4NDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uanMKQEAgLTI3LDcgKzI3LDcgQEAKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5k cyB7V2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9ufQotICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0PX0gb2JqZWN0CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZW1vdGVP YmplY3R9IG9iamVjdAogICogQHBhcmFtIHtzdHJpbmd8RWxlbWVudD19IHRpdGxlCiAgKiBAcGFy YW0ge3N0cmluZz19IHN1YnRpdGxlCiAgKiBAcGFyYW0ge3N0cmluZz19IGVtcHR5UGxhY2Vob2xk ZXIKQEAgLTUwLDM4ICs1MCw2IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlv biA9IGZ1bmN0aW9uKG9iamVjdCwgdGl0bGUsIHN1YnRpdGxlLCBlbXB0eVBsCiAKIFdlYkluc3Bl Y3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5fYXJyYXlMb2FkVGhyZXNob2xkID0gMTAwOwog Ci0KLS8qKgotICogQGludGVyZmFjZQotICovCi1XZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGll c1NlY3Rpb24uQ29udGV4dE1lbnVQcm92aWRlciA9IGZ1bmN0aW9uKCkKLXsKLX0KLQotV2ViSW5z cGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLkNvbnRleHRNZW51UHJvdmlkZXIucHJvdG90 eXBlID0gewotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLk9iamVjdFByb3Bl cnRpZXNTZWN0aW9ufSBzZWN0aW9uCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4 dE1lbnV9IGNvbnRleHRNZW51Ci0gICAgICovCi0gICAgcG9wdWxhdGVDb250ZXh0TWVudTogZnVu Y3Rpb24oc2VjdGlvbiwgY29udGV4dE1lbnUpCi0gICAgewotICAgIH0KLX0KLQotCi0vKioKLSAq IEB0eXBlIHtBcnJheS48V2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLkNvbnRl eHRNZW51UHJvdmlkZXI+fQotICovCi1XZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rp b24uX2NvbnRleHRNZW51UHJvdmllcnMgPSBbXTsKLQotLyoqCi0gKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5Db250ZXh0TWVudVByb3ZpZGVyfSBwcm92aWRl cgotICovCi1XZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uYWRkQ29udGV4dE1l bnVQcm92aWRlciA9IGZ1bmN0aW9uKHByb3ZpZGVyKQotewotICAgIFdlYkluc3BlY3Rvci5PYmpl Y3RQcm9wZXJ0aWVzU2VjdGlvbi5fY29udGV4dE1lbnVQcm92aWVycy5wdXNoKHByb3ZpZGVyKTsK LX0KLQogV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsK ICAgICBlbmFibGVDb250ZXh0TWVudTogZnVuY3Rpb24oKQogICAgIHsKQEAgLTkxLDkgKzU5LDcg QEAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAg ICBfY29udGV4dE1lbnVFdmVudEZpcmVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAg IHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKLSAgICAg ICAgdmFyIHByb3ZpZGVycyA9IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5f Y29udGV4dE1lbnVQcm92aWVyczsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm92aWRl cnMubGVuZ3RoOyBpKyspCi0gICAgICAgICAgICBwcm92aWRlcnNbaV0ucG9wdWxhdGVDb250ZXh0 TWVudSh0aGlzLCBjb250ZXh0TWVudSk7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEFwcGxp Y2FibGVJdGVtcyh0aGlzLm9iamVjdCk7CiAgICAgICAgIGlmICghY29udGV4dE1lbnUuaXNFbXB0 eSgpKQogICAgICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CiAgICAgfSwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwpp bmRleCA3ODViYmIxZTRiOGFlYTk0ODkyODc5YjlhNmZkYTYzM2FiZWM1OTFiLi4wOWIwZmI5NDRm NTMzMDUwMTU2YzIzM2Q5NmI4ZGM0OGQzNDQxOWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC0xODMsNiArMTgzLDcg QEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXIucHJvdG90eXBlID0gewogLyoqCiAgKiBAY29u c3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUGFuZWx9CisgKiBAaW1wbGVtZW50 cyB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LlByb3ZpZGVyfQogICovCiBXZWJJbnNwZWN0b3Iu UHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTI1Myw3ICsyNTQsNyBAQCBXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9jcmVhdGVGaWxlU2Vs ZWN0b3JFbGVtZW50KCk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRl eHRtZW51IiwgdGhpcy5faGFuZGxlQ29udGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCB0cnVlKTsK IAotICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5hZGRDb250ZXh0TWVu dVByb3ZpZGVyKG5ldyBXZWJJbnNwZWN0b3IuUmV2ZWFsSW5IZWFwU25hcHNob3RDb250ZXh0TWVu dVByb3ZpZGVyKCkpOworICAgIFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5yZWdpc3RlclByb3Zp ZGVyKHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7 CkBAIC0xMDc0LDM2ICsxMDc1LDIzIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIGlmIChkb25lID49IHRvdGFsKQogICAgICAgICAgICAgICAg IHRoaXMuX3JlbW92ZVRlbXBvcmFyeVByb2ZpbGUoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBy b2ZpbGVUeXBlLlR5cGVJZCk7CiAgICAgICAgIH0KLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJv dG90eXBlOwotCi0KLS8qKgotICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5Db250ZXh0TWVudVByb3ZpZGVyfQotICogQGNvbnN0cnVjdG9yCi0gKi8K LVdlYkluc3BlY3Rvci5SZXZlYWxJbkhlYXBTbmFwc2hvdENvbnRleHRNZW51UHJvdmlkZXIgPSBm dW5jdGlvbigpCi17Ci19CisgICAgfSwKIAotV2ViSW5zcGVjdG9yLlJldmVhbEluSGVhcFNuYXBz aG90Q29udGV4dE1lbnVQcm92aWRlci5wcm90b3R5cGUgPSB7Ci0gICAgLyoqCi0gICAgICogQG92 ZXJyaWRlCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rp b259IHNlY3Rpb24KKyAgICAvKiogCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4 dE1lbnV9IGNvbnRleHRNZW51CisgICAgICogQHBhcmFtIHtPYmplY3R9IHRhcmdldAogICAgICAq LwotICAgIHBvcHVsYXRlQ29udGV4dE1lbnU6IGZ1bmN0aW9uKHNlY3Rpb24sIGNvbnRleHRNZW51 KQorICAgIGFwcGVuZEFwcGxpY2FibGVJdGVtczogZnVuY3Rpb24oY29udGV4dE1lbnUsIHRhcmdl dCkKICAgICB7Ci0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5jdXJyZW50 UGFuZWwoKSAhPT0gV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwuX2luc3RhbmNlKQorICAgICAg ICBpZiAoV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuY3VycmVudFBhbmVsKCkgIT09IHRoaXMp CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIG9iamVjdElkID0gc2VjdGlvbi5v YmplY3Qub2JqZWN0SWQ7CisgICAgICAgIHZhciBvYmplY3QgPSAvKiogQHR5cGUge1dlYkluc3Bl Y3Rvci5SZW1vdGVPYmplY3R9ICovIHRhcmdldDsKKyAgICAgICAgdmFyIG9iamVjdElkID0gb2Jq ZWN0Lm9iamVjdElkOwogICAgICAgICBpZiAoIW9iamVjdElkKQogICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgIHZhciBoZWFwUHJvZmlsZXMgPSBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5l bC5faW5zdGFuY2UuZ2V0UHJvZmlsZXMoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVU eXBlLlR5cGVJZCk7CisgICAgICAgIHZhciBoZWFwUHJvZmlsZXMgPSB0aGlzLmdldFByb2ZpbGVz KFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQcm9maWxlVHlwZS5UeXBlSWQpOwogICAgICAgICBp ZiAoIWhlYXBQcm9maWxlcy5sZW5ndGgpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTExMTQs MTAgKzExMDIsMTAgQEAgV2ViSW5zcGVjdG9yLlJldmVhbEluSGVhcFNuYXBzaG90Q29udGV4dE1l bnVQcm92aWRlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgZnVuY3Rpb24gZGlkUmVjZWl2ZUhl YXBPYmplY3RJZCh2aWV3TmFtZSwgZXJyb3IsIHJlc3VsdCkKICAgICAgICAgewotICAgICAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LmN1cnJlbnRQYW5lbCgpICE9PSBXZWJJ bnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5faW5zdGFuY2UpCisgICAgICAgICAgICBpZiAoV2ViSW5z cGVjdG9yLmluc3BlY3RvclZpZXcuY3VycmVudFBhbmVsKCkgIT09IHRoaXMpCiAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgaWYgKCFlcnJvcikKLSAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5faW5zdGFuY2Uuc2hvd09iamVjdChyZXN1bHQsIHZp ZXdOYW1lKTsKKyAgICAgICAgICAgICAgICB0aGlzLnNob3dPYmplY3QocmVzdWx0LCB2aWV3TmFt ZSk7CiAgICAgICAgIH0KIAogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiUmV2ZWFsIGluIERvbWluYXRvcnMgVmlldyIpLCByZXZlYWxJblZpZXcu YmluZCh0aGlzLCAiRG9taW5hdG9ycyIpKTsKQEAgLTExMjUsNiArMTExMyw3IEBAIFdlYkluc3Bl Y3Rvci5SZXZlYWxJbkhlYXBTbmFwc2hvdENvbnRleHRNZW51UHJvdmlkZXIucHJvdG90eXBlID0g ewogICAgIH0KIH0KIAorV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9fcHJv dG9fXyA9IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7CiAKIC8qKgogICogQGNvbnN0cnVj dG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCmluZGV4IDA4YmQ2NmFmMjNkZmFiOTU2YWZlMTY2OTRiOTA0MWM5ZDJkNzMyMmIuLjQ5 ZGFkODkxNDZhYzMzMzU1MzVkOGNlNGMyNjVmOWVlNzYzZTA2M2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xOTksNyAr MTk5LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHdvcmtzcGFjZUZv clRlc3QpCiAgICAgdGhpcy5fd29ya3NwYWNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LldvcmtzcGFjZS5FdmVudHMuV29ya3NwYWNlUmVzZXQsIHRoaXMuX3Jlc2V0LmJpbmQodGhpcyks IHRoaXMpOwogCiAgICAgV2ViSW5zcGVjdG9yLmFkdmFuY2VkU2VhcmNoQ29udHJvbGxlci5yZWdp c3RlclNlYXJjaFNjb3BlKG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c1NlYXJjaFNjb3BlKHRoaXMu X3dvcmtzcGFjZSkpOwotICAgIFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5yZWdpc3RlclByb3Zp ZGVyKHRoaXMpOwogfQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsRGVzY3JpcHRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsRGVzY3JpcHRvci5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40Yzc2OThkYzI4ODRkMDY0ZDdmYWM5 NWQxYWVjNjRkYWQwYjNlMTY1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLmpzCkBAIC0wLDAgKzEsNTEg QEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorICog Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkK KyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKy8qKgorICog QGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlBhbmVsRGVzY3JpcHRvcn0K KyAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUuUHJvdmlkZXJ9CisgKi8K K1dlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWxEZXNjcmlwdG9yID0gZnVuY3Rpb24oKQoreworICAg IFdlYkluc3BlY3Rvci5QYW5lbERlc2NyaXB0b3IuY2FsbCh0aGlzLCAic2NyaXB0cyIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiU291cmNlcyIpLCAiU2NyaXB0c1BhbmVsIiwgIlNjcmlwdHNQYW5l bC5qcyIpOworICAgIFdlYkluc3BlY3Rvci5Db250ZXh0TWVudS5yZWdpc3RlclByb3ZpZGVyKHRo aXMpOworfQorCitXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5wcm90b3R5cGUg PSB7CisgICAgLyoqIAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51fSBj b250ZXh0TWVudQorICAgICAqIEBwYXJhbSB7T2JqZWN0fSB0YXJnZXQKKyAgICAgKi8KKyAgICBh cHBlbmRBcHBsaWNhYmxlSXRlbXM6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCB0YXJnZXQpCisgICAg eworICAgICAgICBpZiAoISh0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5wYW5lbCgpLmFwcGVuZEFw cGxpY2FibGVJdGVtcyhjb250ZXh0TWVudSwgdGFyZ2V0KTsKKyAgICB9Cit9CisKK1dlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNw ZWN0b3IuUGFuZWxEZXNjcmlwdG9yLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2F0Y2hFeHByZXNzaW9uc1NpZGViYXJQYW5lLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJh clBhbmUuanMKaW5kZXggMjQ1ZmIyZWMzNGIwNWE4MWZlZTAwYTM4NjdiMzE0ZGUwZGU2MjA1My4u Y2FlZDRmOTg4YTQ4NmRjYjFlZTZlZDE2OTA3MjQwNDgxMzkwZDY0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBh bmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJl c3Npb25zU2lkZWJhclBhbmUuanMKQEAgLTEyMyw3ICsxMjMsNyBAQCBXZWJJbnNwZWN0b3IuV2F0 Y2hFeHByZXNzaW9uc1NlY3Rpb24gPSBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy5fd2F0Y2hPYmpl Y3RHcm91cElkID0gIndhdGNoLWdyb3VwIjsKIAotICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbi5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1p dGl2ZVZhbHVlKCIiKSk7CiAKICAgICB0aGlzLmVtcHR5RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuZW1wdHlFbGVtZW50LmNsYXNzTmFtZSA9ICJpbmZv IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0 LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRl eCBjOWM4NDk3YTVjMGY5NDJjNDFkMjI4MmU2ZGE1ODE5YzhiZmE4MDdiLi5lNTViMmZlNjkxYjRm Y2FiZWMwNTA2NzY0NTY4YjA5ZWU2ZjFjNjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC0xMTAsNiArMTEwLDcgQEAKICAgICA8ZmlsZT5O ZXR3b3JrTG9nLmpzPC9maWxlPgogICAgIDxmaWxlPk5ldHdvcmtNYW5hZ2VyLmpzPC9maWxlPgog ICAgIDxmaWxlPk5ldHdvcmtQYW5lbC5qczwvZmlsZT4KKyAgICA8ZmlsZT5OZXR3b3JrUGFuZWxE ZXNjcmlwdG9yLmpzPC9maWxlPgogICAgIDxmaWxlPk5ldHdvcmtSZXF1ZXN0LmpzPC9maWxlPgog ICAgIDxmaWxlPk9iamVjdC5qczwvZmlsZT4KICAgICA8ZmlsZT5PYmplY3RQb3BvdmVySGVscGVy LmpzPC9maWxlPgpAQCAtMTUxLDYgKzE1Miw3IEBACiAgICAgPGZpbGU+U2NyaXB0Rm9ybWF0dGVy V29ya2VyLmpzPC9maWxlPgogICAgIDxmaWxlPlNjcmlwdFNuaXBwZXRNb2RlbC5qczwvZmlsZT4K ICAgICA8ZmlsZT5TY3JpcHRzUGFuZWwuanM8L2ZpbGU+CisgICAgPGZpbGU+U2NyaXB0c1BhbmVs RGVzY3JpcHRvci5qczwvZmlsZT4KICAgICA8ZmlsZT5TY3JpcHRzTmF2aWdhdG9yLmpzPC9maWxl PgogICAgIDxmaWxlPlNjcmlwdHNTZWFyY2hTY29wZS5qczwvZmlsZT4KICAgICA8ZmlsZT5TZWFy Y2hDb250cm9sbGVyLmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggNWZkZDJiNDc3ZTc1NzFjZGM5OTY5MGMxOGI1 MDY3YjQyMTE1MjdiNS4uYTJhZWI5NzJmMmIxMjJkYThmNmIzZGIzYTk4M2FmNzFkMjE2MDZkYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu aHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5o dG1sCkBAIC0xNTgsNiArMTU4LDggQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJTY3JpcHRTbmlwcGV0TW9kZWwuanMiPjwvc2NyaXB0PgogICAgIDxz Y3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlByb2dyZXNzQmFyLmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTdHlsZVNvdXJjZS5q cyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iTmV0 d29ya1BhbmVsRGVzY3JpcHRvci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0c1BhbmVsRGVzY3JpcHRvci5qcyI+PC9zY3JpcHQ+CiA8 L2hlYWQ+CiA8Ym9keSBjbGFzcz0iZGV0YWNoZWQiIGlkPSItd2Via2l0LXdlYi1pbnNwZWN0b3Ii PgogICAgIDxkaXYgaWQ9InRvb2xiYXIiPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBlMDU1ZDExMmVmNTc2NTNkMDkxNDc5ZTZmMTIy YWY1YTVlNTg0MmUxLi4yOGRmYTJlZWU3NjlhYmYyOWNjZmExMzQ0ZWY3NDZmNWFmOTNhNWRlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpA QCAtMzksOCArMzksOCBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogCiAgICAgICAgIHZhciBlbGVt ZW50cyA9IG5ldyBXZWJJbnNwZWN0b3IuUGFuZWxEZXNjcmlwdG9yKCJlbGVtZW50cyIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiRWxlbWVudHMiKSwgIkVsZW1lbnRzUGFuZWwiLCAiRWxlbWVudHNQ YW5lbC5qcyIpOwogICAgICAgICB2YXIgcmVzb3VyY2VzID0gbmV3IFdlYkluc3BlY3Rvci5QYW5l bERlc2NyaXB0b3IoInJlc291cmNlcyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVzb3VyY2Vz IiksICJSZXNvdXJjZXNQYW5lbCIsICJSZXNvdXJjZXNQYW5lbC5qcyIpOwotICAgICAgICB2YXIg bmV0d29yayA9IG5ldyBXZWJJbnNwZWN0b3IuUGFuZWxEZXNjcmlwdG9yKCJuZXR3b3JrIiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJOZXR3b3JrIiksICJOZXR3b3JrUGFuZWwiLCAiTmV0d29ya1Bh bmVsLmpzIik7Ci0gICAgICAgIHZhciBzY3JpcHRzID0gbmV3IFdlYkluc3BlY3Rvci5QYW5lbERl c2NyaXB0b3IoInNjcmlwdHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvdXJjZXMiKSwgIlNj cmlwdHNQYW5lbCIsICJTY3JpcHRzUGFuZWwuanMiKTsKKyAgICAgICAgdmFyIG5ldHdvcmsgPSBu ZXcgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbERlc2NyaXB0b3IoKTsKKyAgICAgICAgdmFyIHNj cmlwdHMgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbERlc2NyaXB0b3IoKTsKICAgICAg ICAgdmFyIHRpbWVsaW5lID0gbmV3IFdlYkluc3BlY3Rvci5QYW5lbERlc2NyaXB0b3IoInRpbWVs aW5lIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpLCAiVGltZWxpbmVQYW5lbCIs ICJUaW1lbGluZVBhbmVsLmpzIik7CiAgICAgICAgIHZhciBwcm9maWxlcyA9IG5ldyBXZWJJbnNw ZWN0b3IuUGFuZWxEZXNjcmlwdG9yKCJwcm9maWxlcyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi UHJvZmlsZXMiKSwgIlByb2ZpbGVzUGFuZWwiLCAiUHJvZmlsZXNQYW5lbC5qcyIpOwogICAgICAg ICB2YXIgYXVkaXRzID0gbmV3IFdlYkluc3BlY3Rvci5QYW5lbERlc2NyaXB0b3IoImF1ZGl0cyIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXVkaXRzIiksICJBdWRpdHNQYW5lbCIsICJBdWRpdHNQ YW5lbC5qcyIpOwo=