44687 2010-08-26 08:25:22 -0700 Web Inspector: use context menu items with checkbox for DOM breakpoints 2010-08-27 06:39:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 podivilov webkit-unassigned pfeldman oldest_to_newest 269894 0 podivilov 2010-08-26 08:25:22 -0700 Web Inspector: use context menu items with checkbox for setting and removing DOM breakpoints 269895 1 65568 podivilov 2010-08-26 08:29:19 -0700 Created attachment 65568 Proposed patch. 269906 2 65570 podivilov 2010-08-26 08:48:44 -0700 Created attachment 65570 Proposed patch. 269908 3 65571 podivilov 2010-08-26 08:49:29 -0700 Created attachment 65571 Proposed patch. 269911 4 65572 podivilov 2010-08-26 08:53:38 -0700 Created attachment 65572 Proposed patch. 269915 5 65572 pfeldman 2010-08-26 08:57:15 -0700 Comment on attachment 65572 Proposed patch. WebCore/inspector/front-end/DOMAgent.js:743 + WebInspector.DOMBreakpoint.ContextMenuLabels = {}; This slows down our load time, please do it lazily. 269920 6 65574 podivilov 2010-08-26 09:14:55 -0700 Created attachment 65574 Proposed patch. 270464 7 pfeldman 2010-08-27 06:39:10 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/front-end/BreakpointsSidebarPane.js M WebCore/inspector/front-end/DOMAgent.js M WebCore/inspector/front-end/ElementsTreeOutline.js M WebCore/inspector/front-end/inspector.js Committed r66213 65568 2010-08-26 08:29:19 -0700 2010-08-26 08:48:44 -0700 Proposed patch. context_menu.patch text/plain 4722 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTMyZTQwZi4uNjFjZmRiNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwxOCBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBjb250ZXh0IG1lbnUg aXRlbXMgd2l0aCBjaGVja2JveCBmb3Igc2V0dGluZyBhbmQgcmVtb3ZpbmcgRE9NIGJyZWFrcG9p bnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDY4 NworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUuZmluZEJyZWFrcG9p bnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5f cG9wdWxhdGVUYWdDb250ZXh0TWVudSk6CisKKzIwMTAtMDgtMjYgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKICAgICAgICAgV2ViIEluc3BlY3RvcjogcHJvdmlkZSBtb3JlIGluZm9ybWF0aW9u IHRvIGZyb250LWVuZCB3aGVuIGJyZWFraW5nIG9uIERPTSBldmVudAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2NzkKIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IDVjYjZkMTIuLjZkNzUxNzcgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKQEAgLTcwMiw2ICs3MDIsMTMgQEAgV2ViSW5z cGVjdG9yLkRPTUJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoImRvbS1icmVha3BvaW50LWFkZGVkIiwgYnJlYWtwb2lu dCk7CiAgICAgfSwKIAorICAgIGZpbmRCcmVha3BvaW50OiBmdW5jdGlvbihub2RlSWQsIHR5cGUp CisgICAgeworICAgICAgICB2YXIgbm9kZUJyZWFrcG9pbnRzID0gdGhpcy5fYnJlYWtwb2ludHNb bm9kZUlkXTsKKyAgICAgICAgaWYgKG5vZGVCcmVha3BvaW50cyAmJiB0eXBlIGluIG5vZGVCcmVh a3BvaW50cykKKyAgICAgICAgICAgIHJldHVybiBub2RlQnJlYWtwb2ludHNbdHlwZV07CisgICAg fSwKKwogICAgIHJlbW92ZUJyZWFrcG9pbnRzRm9yTm9kZTogZnVuY3Rpb24obm9kZSkKICAgICB7 CiAgICAgICAgIHZhciBub2RlQnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1tub2RlLmlk XTsKQEAgLTc1MCw2ICs3NTcsMTEgQEAgV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuTGFiZWxz W1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2RpZmkKIFdlYkluc3Bl Y3Rvci5ET01CcmVha3BvaW50LkxhYmVsc1tXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBl cy5BdHRyaWJ1dGVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkF0dHJpYnV0ZSBN b2RpZmllZCIpOwogV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuTGFiZWxzW1dlYkluc3BlY3Rv ci5ET01CcmVha3BvaW50LlR5cGVzLk5vZGVSZW1vdmVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTm9kZSBSZW1vdmVkIik7CiAKK1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LkNvbnRleHRN ZW51TGFiZWxzID0ge307CitXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5Db250ZXh0TWVudUxh YmVsc1tXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBlcy5TdWJ0cmVlTW9kaWZpZWRdID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIFN1YnRyZWUgTW9kaWZpY2F0aW9ucyIpOwor V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHNbV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuVHlwZXMuQXR0cmlidXRlTW9kaWZpZWRdID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJTdG9wIG9uIEF0dHJpYnV0ZXMgTW9kaWZpY2F0aW9ucyIpOworV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9p bnQuVHlwZXMuTm9kZVJlbW92ZWRdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIE5v ZGUgUmVtb3ZhbCIpOworCiBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5wcm90b3R5cGUgPSB7 CiAgICAgZ2V0IGVuYWJsZWQoKQogICAgIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggYWU5ZTQwYS4uMjk1ZGJkOSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anMKQEAgLTc2NSwxNiArNzY1LDE2IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKFByZWZlcmVuY2VzLmRvbUJyZWFrcG9pbnRzRW5h YmxlZCkgewogICAgICAgICAgICAgLy8gQWRkIGRlYmJ1Z2luZy1yZWxhdGVkIGFjdGlvbnMKICAg ICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwotCi0gICAgICAgICAgICBj b250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RvcCBvbiBTdWJ0 cmVlIE1vZGlmaWNhdGlvbnMiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQnJl YWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21CcmVha3Bv aW50TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgV2ViSW5zcGVjdG9yLkRPTUJyZWFr cG9pbnQuVHlwZXMuU3VidHJlZU1vZGlmaWVkKSk7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RvcCBvbiBBdHRyaWJ1dGVzIE1vZGlm aWNhdGlvbnMiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1h bmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdl ciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlw ZXMuQXR0cmlidXRlTW9kaWZpZWQpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIE5vZGUgUmVtb3ZhbCIpLAotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5zZXRCcmVha3BvaW50 LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLCB0aGlzLnJlcHJlc2VudGVk T2JqZWN0LCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBlcy5Ob2RlUmVtb3ZlZCkpOwot Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiUmVtb3ZlIEJyZWFrcG9pbnRzIiksCi0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRv bUJyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZUJyZWFrcG9pbnRzRm9yTm9kZS5iaW5kKFdlYkluc3Bl Y3Rvci5kb21CcmVha3BvaW50TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCkpOworICAg ICAgICAgICAgZm9yICh2YXIgdHlwZSBpbiBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBl cykgeworICAgICAgICAgICAgICAgIHZhciB0eXBlSWQgPSBXZWJJbnNwZWN0b3IuRE9NQnJlYWtw b2ludC5UeXBlc1t0eXBlXTsKKyAgICAgICAgICAgICAgICB2YXIgbGFiZWwgPSBXZWJJbnNwZWN0 b3IuRE9NQnJlYWtwb2ludC5Db250ZXh0TWVudUxhYmVsc1t0eXBlSWRdOworICAgICAgICAgICAg ICAgIHZhciBicmVha3BvaW50ID0gV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLmZp bmRCcmVha3BvaW50KHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaWQsIHR5cGVJZCk7CisgICAgICAg ICAgICAgICAgaWYgKCFicmVha3BvaW50KQorICAgICAgICAgICAgICAgICAgICB2YXIgaGFuZGxl ciA9IFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5zZXRCcmVha3BvaW50LmJpbmQo V2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0 LCB0eXBlSWQpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdmFy IGhhbmRsZXIgPSBicmVha3BvaW50LnJlbW92ZS5iaW5kKGJyZWFrcG9pbnQpOworICAgICAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShsYWJlbCwgaGFuZGxlciwgISFi cmVha3BvaW50KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0sCiAK 65570 2010-08-26 08:48:44 -0700 2010-08-26 08:49:29 -0700 Proposed patch. context_menu.patch text/plain 5636 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTMyZTQwZi4uMjAxZGJhOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBjb250ZXh0IG1lbnUg aXRlbXMgd2l0aCBjaGVja2JveCBmb3Igc2V0dGluZyBhbmQgcmVtb3ZpbmcgRE9NIGJyZWFrcG9p bnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDY4 NworCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLmZpbmRCcmVha3BvaW50KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3BvcHVsYXRlVGFn Q29udGV4dE1lbnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLnBhdXNlZFNjcmlwdCk6CisKKzIwMTAtMDgtMjYgIFBh dmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgV2ViIEluc3BlY3RvcjogcHJvdmlkZSBt b3JlIGluZm9ybWF0aW9uIHRvIGZyb250LWVuZCB3aGVuIGJyZWFraW5nIG9uIERPTSBldmVudAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2NzkKIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzOGQyNTU3Li44 ZTdmYmJmIDEwMDY0NApCaW5hcnkgZmlsZXMgYS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcyBhbmQgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcyBkaWZmZXIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01B Z2VudC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwppbmRleCA1 Y2I2ZDEyLi42YjlmZDgzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50Lmpz CkBAIC03MDIsNiArNzAyLDEzIEBAIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50TWFuYWdlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKCJkb20t YnJlYWtwb2ludC1hZGRlZCIsIGJyZWFrcG9pbnQpOwogICAgIH0sCiAKKyAgICBmaW5kQnJlYWtw b2ludDogZnVuY3Rpb24obm9kZUlkLCB0eXBlKQorICAgIHsKKyAgICAgICAgdmFyIG5vZGVCcmVh a3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzW25vZGVJZF07CisgICAgICAgIGlmIChub2RlQnJl YWtwb2ludHMgJiYgdHlwZSBpbiBub2RlQnJlYWtwb2ludHMpCisgICAgICAgICAgICByZXR1cm4g bm9kZUJyZWFrcG9pbnRzW3R5cGVdOworICAgIH0sCisKICAgICByZW1vdmVCcmVha3BvaW50c0Zv ck5vZGU6IGZ1bmN0aW9uKG5vZGUpCiAgICAgewogICAgICAgICB2YXIgbm9kZUJyZWFrcG9pbnRz ID0gdGhpcy5fYnJlYWtwb2ludHNbbm9kZS5pZF07CkBAIC03NTAsNiArNzU3LDExIEBAIFdlYklu c3BlY3Rvci5ET01CcmVha3BvaW50LkxhYmVsc1tXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5U eXBlcy5TdWJ0cmVlTW9kaWZpCiBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNbV2Vi SW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuQXR0cmlidXRlTW9kaWZpZWRdID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJBdHRyaWJ1dGUgTW9kaWZpZWQiKTsKIFdlYkluc3BlY3Rvci5ET01C cmVha3BvaW50LkxhYmVsc1tXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBlcy5Ob2RlUmVt b3ZlZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vZGUgUmVtb3ZlZCIpOwogCitXZWJJbnNw ZWN0b3IuRE9NQnJlYWtwb2ludC5Db250ZXh0TWVudUxhYmVscyA9IHt9OworV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9p bnQuVHlwZXMuU3VidHJlZU1vZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQnJlYWsg b24gU3VidHJlZSBNb2RpZmljYXRpb25zIik7CitXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5D b250ZXh0TWVudUxhYmVsc1tXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBlcy5BdHRyaWJ1 dGVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJyZWFrIG9uIEF0dHJpYnV0ZXMg TW9kaWZpY2F0aW9ucyIpOworV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVM YWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuTm9kZVJlbW92ZWRdID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJCcmVhayBvbiBOb2RlIFJlbW92YWwiKTsKKwogV2ViSW5zcGVj dG9yLkRPTUJyZWFrcG9pbnQucHJvdG90eXBlID0gewogICAgIGdldCBlbmFibGVkKCkKICAgICB7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0 bGluZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5l LmpzCmluZGV4IGFlOWU0MGEuLjI5NWRiZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC03NjUsMTYgKzc2NSwxNiBAQCBX ZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlm IChQcmVmZXJlbmNlcy5kb21CcmVha3BvaW50c0VuYWJsZWQpIHsKICAgICAgICAgICAgIC8vIEFk ZCBkZWJidWdpbmctcmVsYXRlZCBhY3Rpb25zCiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRTZXBhcmF0b3IoKTsKLQotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlN0b3Agb24gU3VidHJlZSBNb2RpZmljYXRpb25zIiksCi0gICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9p bnQuYmluZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50 ZWRPYmplY3QsIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2RpZmll ZCkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlN0b3Agb24gQXR0cmlidXRlcyBNb2RpZmljYXRpb25zIiksCi0gICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9pbnQuYmluZChX ZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50ZWRPYmplY3Qs IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLkF0dHJpYnV0ZU1vZGlmaWVkKSk7Ci0g ICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygi U3RvcCBvbiBOb2RlIFJlbW92YWwiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9t QnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21CcmVh a3BvaW50TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgV2ViSW5zcGVjdG9yLkRPTUJy ZWFrcG9pbnQuVHlwZXMuTm9kZVJlbW92ZWQpKTsKLQotICAgICAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92ZSBCcmVha3BvaW50cyIpLAot ICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5yZW1vdmVC cmVha3BvaW50c0Zvck5vZGUuYmluZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIs IHRoaXMucmVwcmVzZW50ZWRPYmplY3QpKTsKKyAgICAgICAgICAgIGZvciAodmFyIHR5cGUgaW4g V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMpIHsKKyAgICAgICAgICAgICAgICB2YXIg dHlwZUlkID0gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXNbdHlwZV07CisgICAgICAg ICAgICAgICAgdmFyIGxhYmVsID0gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1l bnVMYWJlbHNbdHlwZUlkXTsKKyAgICAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IFdlYklu c3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5maW5kQnJlYWtwb2ludCh0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0LmlkLCB0eXBlSWQpOworICAgICAgICAgICAgICAgIGlmICghYnJlYWtwb2ludCkK KyAgICAgICAgICAgICAgICAgICAgdmFyIGhhbmRsZXIgPSBXZWJJbnNwZWN0b3IuZG9tQnJlYWtw b2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50 TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgdHlwZUlkKTsKKyAgICAgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHZhciBoYW5kbGVyID0gYnJlYWtwb2ludC5yZW1v dmUuYmluZChicmVha3BvaW50KTsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRD aGVja2JveEl0ZW0obGFiZWwsIGhhbmRsZXIsICEhYnJlYWtwb2ludCk7CisgICAgICAgICAgICB9 CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwppbmRleCBlNzk5NDZkLi42MTc4Zjc5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKQEAgLTE0NDgsNiArMTQ0OCw3IEBAIFdlYkluc3BlY3Rvci5wYXVzZWRT Y3JpcHQgPSBmdW5jdGlvbihjYWxsRnJhbWVzLCBkZXRhaWxzKQogICAgIHRoaXMucGFuZWxzLnNj cmlwdHMuZGVidWdnZXJQYXVzZWQoY2FsbEZyYW1lcyk7CiAgICAgaWYgKGRldGFpbHMpCiAgICAg ICAgIHRoaXMuZG9tQnJlYWtwb2ludE1hbmFnZXIuYnJlYWtwb2ludEhpdChkZXRhaWxzLm5vZGVJ ZCwgZGV0YWlscy50eXBlKTsKKyAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250 KCk7CiB9CiAKIFdlYkluc3BlY3Rvci5yZXN1bWVkU2NyaXB0ID0gZnVuY3Rpb24oKQo= 65571 2010-08-26 08:49:29 -0700 2010-08-26 08:53:38 -0700 Proposed patch. context_menu.patch text/plain 5892 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTMyZTQwZi4uMjAxZGJhOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMSBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSBjb250ZXh0IG1lbnUg aXRlbXMgd2l0aCBjaGVja2JveCBmb3Igc2V0dGluZyBhbmQgcmVtb3ZpbmcgRE9NIGJyZWFrcG9p bnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDY4 NworCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLmZpbmRCcmVha3BvaW50KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3BvcHVsYXRlVGFn Q29udGV4dE1lbnUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLnBhdXNlZFNjcmlwdCk6CisKKzIwMTAtMDgtMjYgIFBh dmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgV2ViIEluc3BlY3RvcjogcHJvdmlkZSBt b3JlIGluZm9ybWF0aW9uIHRvIGZyb250LWVuZCB3aGVuIGJyZWFraW5nIG9uIERPTSBldmVudAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2NzkKIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzOGQyNTU3Yzgz M2JmZTNjNDliNDJmNzU5OWY0OGRlM2QwM2M0NzhjLi44ZTdmYmJmNzZiODYwYzM0NTMxZjI1MDUw ZDZlN2E4Y2EwM2Y1OTRkIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEzMgp6Y21aMj5m b2FRbXJWV2ZybFFwfHRJR3FAWjcqWkokOEx9czliWCFrZS0+cmNwYTw1dyNne000T1IwPiZzUmdi QX4KeUVRMTFyRWY2YSlBV1R9LTZUQTdscUxLSUgpNDRwR0h8SkshUFBYbjlvNk90Skg8YGJPWkxA WG5ZYmdNSyoodFJFCgpkZWx0YSAxMTkKemNtZG1Ub0B2PHlyVldmcmxVTF8pWlRfbik9Uk5zK3Ay KzBDJTZ5WTI9UDZCPVNKQnpibj9GZipHUDlCc2RvVilACnVMcTA+bkJxaSZ+KGxhJCsre3F1NWxx Y1UrO3pIdGshYFZIYHJqeENhPGEoNTJIJjUtNm1qKGRicWJEZjwKCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRE9NQWdlbnQuanMKaW5kZXggNWNiNmQxMi4uNmI5ZmQ4MyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAtNzAyLDYgKzcwMiwxMyBAQCBXZWJJbnNw ZWN0b3IuRE9NQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycygiZG9tLWJyZWFrcG9pbnQtYWRkZWQiLCBicmVha3BvaW50 KTsKICAgICB9LAogCisgICAgZmluZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKG5vZGVJZCwgdHlwZSkK KyAgICB7CisgICAgICAgIHZhciBub2RlQnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1tu b2RlSWRdOworICAgICAgICBpZiAobm9kZUJyZWFrcG9pbnRzICYmIHR5cGUgaW4gbm9kZUJyZWFr cG9pbnRzKQorICAgICAgICAgICAgcmV0dXJuIG5vZGVCcmVha3BvaW50c1t0eXBlXTsKKyAgICB9 LAorCiAgICAgcmVtb3ZlQnJlYWtwb2ludHNGb3JOb2RlOiBmdW5jdGlvbihub2RlKQogICAgIHsK ICAgICAgICAgdmFyIG5vZGVCcmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzW25vZGUuaWRd OwpAQCAtNzUwLDYgKzc1NywxMSBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNb V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuU3VidHJlZU1vZGlmaQogV2ViSW5zcGVj dG9yLkRPTUJyZWFrcG9pbnQuTGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVz LkF0dHJpYnV0ZU1vZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXR0cmlidXRlIE1v ZGlmaWVkIik7CiBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNbV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuVHlwZXMuTm9kZVJlbW92ZWRdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJOb2RlIFJlbW92ZWQiKTsKIAorV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1l bnVMYWJlbHMgPSB7fTsKK1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LkNvbnRleHRNZW51TGFi ZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2RpZmllZF0gPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJyZWFrIG9uIFN1YnRyZWUgTW9kaWZpY2F0aW9ucyIpOwor V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHNbV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuVHlwZXMuQXR0cmlidXRlTW9kaWZpZWRdID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJCcmVhayBvbiBBdHRyaWJ1dGVzIE1vZGlmaWNhdGlvbnMiKTsKK1dlYkluc3BlY3Rv ci5ET01CcmVha3BvaW50LkNvbnRleHRNZW51TGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3Bv aW50LlR5cGVzLk5vZGVSZW1vdmVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQnJlYWsgb24g Tm9kZSBSZW1vdmFsIik7CisKIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LnByb3RvdHlwZSA9 IHsKICAgICBnZXQgZW5hYmxlZCgpCiAgICAgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwppbmRleCBhZTllNDBhLi4yOTVkYmQ5IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGlu ZS5qcwpAQCAtNzY1LDE2ICs3NjUsMTYgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1l bnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoUHJlZmVyZW5jZXMuZG9tQnJlYWtwb2ludHNF bmFibGVkKSB7CiAgICAgICAgICAgICAvLyBBZGQgZGViYnVnaW5nLXJlbGF0ZWQgYWN0aW9ucwog ICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7Ci0KLSAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIFN1 YnRyZWUgTW9kaWZpY2F0aW9ucyIpLAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21C cmVha3BvaW50TWFuYWdlci5zZXRCcmVha3BvaW50LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJyZWFr cG9pbnRNYW5hZ2VyLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LCBXZWJJbnNwZWN0b3IuRE9NQnJl YWtwb2ludC5UeXBlcy5TdWJ0cmVlTW9kaWZpZWQpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIEF0dHJpYnV0ZXMgTW9k aWZpY2F0aW9ucyIpLAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50 TWFuYWdlci5zZXRCcmVha3BvaW50LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5h Z2VyLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5U eXBlcy5BdHRyaWJ1dGVNb2RpZmllZCkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5k SXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3Agb24gTm9kZSBSZW1vdmFsIiksCi0gICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9p bnQuYmluZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50 ZWRPYmplY3QsIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLk5vZGVSZW1vdmVkKSk7 Ci0KLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJSZW1vdmUgQnJlYWtwb2ludHMiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQnJlYWtwb2ludE1hbmFnZXIucmVtb3ZlQnJlYWtwb2ludHNGb3JOb2RlLmJpbmQoV2ViSW5z cGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0KSk7Cisg ICAgICAgICAgICBmb3IgKHZhciB0eXBlIGluIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5 cGVzKSB7CisgICAgICAgICAgICAgICAgdmFyIHR5cGVJZCA9IFdlYkluc3BlY3Rvci5ET01CcmVh a3BvaW50LlR5cGVzW3R5cGVdOworICAgICAgICAgICAgICAgIHZhciBsYWJlbCA9IFdlYkluc3Bl Y3Rvci5ET01CcmVha3BvaW50LkNvbnRleHRNZW51TGFiZWxzW3R5cGVJZF07CisgICAgICAgICAg ICAgICAgdmFyIGJyZWFrcG9pbnQgPSBXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIu ZmluZEJyZWFrcG9pbnQodGhpcy5yZXByZXNlbnRlZE9iamVjdC5pZCwgdHlwZUlkKTsKKyAgICAg ICAgICAgICAgICBpZiAoIWJyZWFrcG9pbnQpCisgICAgICAgICAgICAgICAgICAgIHZhciBoYW5k bGVyID0gV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9pbnQuYmlu ZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QsIHR5cGVJZCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2 YXIgaGFuZGxlciA9IGJyZWFrcG9pbnQucmVtb3ZlLmJpbmQoYnJlYWtwb2ludCk7CisgICAgICAg ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKGxhYmVsLCBoYW5kbGVyLCAh IWJyZWFrcG9pbnQpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggZTc5OTQ2ZC4uNjE3OGY3OSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xNDQ4LDYgKzE0 NDgsNyBAQCBXZWJJbnNwZWN0b3IucGF1c2VkU2NyaXB0ID0gZnVuY3Rpb24oY2FsbEZyYW1lcywg ZGV0YWlscykKICAgICB0aGlzLnBhbmVscy5zY3JpcHRzLmRlYnVnZ2VyUGF1c2VkKGNhbGxGcmFt ZXMpOwogICAgIGlmIChkZXRhaWxzKQogICAgICAgICB0aGlzLmRvbUJyZWFrcG9pbnRNYW5hZ2Vy LmJyZWFrcG9pbnRIaXQoZGV0YWlscy5ub2RlSWQsIGRldGFpbHMudHlwZSk7CisgICAgSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmJyaW5nVG9Gcm9udCgpOwogfQogCiBXZWJJbnNwZWN0b3IucmVzdW1l ZFNjcmlwdCA9IGZ1bmN0aW9uKCkK 65572 2010-08-26 08:53:38 -0700 2010-08-26 09:14:55 -0700 Proposed patch. context_menu.patch text/plain 5858 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWVhMjgzOS4uMGJlNjgwNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMC0wOC0yNiAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB1c2UgY29udGV4dCBtZW51IGl0 ZW1zIHdpdGggY2hlY2tib3ggZm9yIHNldHRpbmcgYW5kIHJlbW92aW5nIERPTSBicmVha3BvaW50 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2ODcK KworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5maW5kQnJlYWtwb2ludCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLl9wb3B1bGF0ZVRhZ0Nv bnRleHRNZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5wYXVzZWRTY3JpcHQpOgorCisyMDEwLTA4LTI2ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IFBhdmVsIEZlbGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZW5hYmxlIGRlYnVn Z2VyIGFmdGVyIHJlc291cmNlcyBhcmUgcHVzaGVkIHRvIGZyb250LWVuZApkaWZmIC0tZ2l0IGEv V2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9XZWJDb3JlL0VuZ2xp c2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzOGQyNTU3YzgzM2JmZTNjNDliNDJm NzU5OWY0OGRlM2QwM2M0NzhjLi44ZTdmYmJmNzZiODYwYzM0NTMxZjI1MDUwZDZlN2E4Y2EwM2Y1 OTRkIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEzMgp6Y21aMj5mb2FRbXJWV2ZybFFw fHRJR3FAWjcqWkokOEx9czliWCFrZS0+cmNwYTw1dyNne000T1IwPiZzUmdiQX4KeUVRMTFyRWY2 YSlBV1R9LTZUQTdscUxLSUgpNDRwR0h8SkshUFBYbjlvNk90Skg8YGJPWkxAWG5ZYmdNSyoodFJF CgpkZWx0YSAxMTkKemNtZG1Ub0B2PHlyVldmcmxVTF8pWlRfbik9Uk5zK3AyKzBDJTZ5WTI9UDZC PVNKQnpibj9GZipHUDlCc2RvVilACnVMcTA+bkJxaSZ+KGxhJCsre3F1NWxxY1UrO3pIdGshYFZI YHJqeENhPGEoNTJIJjUtNm1qKGRicWJEZjwKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9N QWdlbnQuanMKaW5kZXggYmQ1MjIzNS4uMmUwNWI4YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9ET01BZ2VudC5qcwpAQCAtNjkyLDYgKzY5MiwxMyBAQCBXZWJJbnNwZWN0b3IuRE9NQnJl YWtwb2ludE1hbmFnZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycygiZG9tLWJyZWFrcG9pbnQtYWRkZWQiLCBicmVha3BvaW50KTsKICAgICB9LAog CisgICAgZmluZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKG5vZGVJZCwgdHlwZSkKKyAgICB7CisgICAg ICAgIHZhciBub2RlQnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1tub2RlSWRdOworICAg ICAgICBpZiAobm9kZUJyZWFrcG9pbnRzICYmIHR5cGUgaW4gbm9kZUJyZWFrcG9pbnRzKQorICAg ICAgICAgICAgcmV0dXJuIG5vZGVCcmVha3BvaW50c1t0eXBlXTsKKyAgICB9LAorCiAgICAgcmVt b3ZlQnJlYWtwb2ludHNGb3JOb2RlOiBmdW5jdGlvbihub2RlKQogICAgIHsKICAgICAgICAgdmFy IG5vZGVCcmVha3BvaW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzW25vZGUuaWRdOwpAQCAtNzMzLDYg Kzc0MCwxMSBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNbV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuVHlwZXMuU3VidHJlZU1vZGlmaQogV2ViSW5zcGVjdG9yLkRPTUJyZWFr cG9pbnQuTGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLkF0dHJpYnV0ZU1v ZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXR0cmlidXRlIE1vZGlmaWVkIik7CiBX ZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9p bnQuVHlwZXMuTm9kZVJlbW92ZWRdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOb2RlIFJlbW92 ZWQiKTsKIAorV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHMgPSB7 fTsKK1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LkNvbnRleHRNZW51TGFiZWxzW1dlYkluc3Bl Y3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkJyZWFrIG9uIFN1YnRyZWUgTW9kaWZpY2F0aW9ucyIpOworV2ViSW5zcGVjdG9y LkRPTUJyZWFrcG9pbnQuQ29udGV4dE1lbnVMYWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9p bnQuVHlwZXMuQXR0cmlidXRlTW9kaWZpZWRdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCcmVh ayBvbiBBdHRyaWJ1dGVzIE1vZGlmaWNhdGlvbnMiKTsKK1dlYkluc3BlY3Rvci5ET01CcmVha3Bv aW50LkNvbnRleHRNZW51TGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLk5v ZGVSZW1vdmVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQnJlYWsgb24gTm9kZSBSZW1vdmFs Iik7CisKIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LnByb3RvdHlwZSA9IHsKICAgICBnZXQg ZW5hYmxlZCgpCiAgICAgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNUcmVlT3V0bGluZS5qcwppbmRleCBhZTllNDBhLi4yOTVkYmQ5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtNzY1 LDE2ICs3NjUsMTYgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBl ID0gewogICAgICAgICBpZiAoUHJlZmVyZW5jZXMuZG9tQnJlYWtwb2ludHNFbmFibGVkKSB7CiAg ICAgICAgICAgICAvLyBBZGQgZGViYnVnaW5nLXJlbGF0ZWQgYWN0aW9ucwogICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7Ci0KLSAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIFN1YnRyZWUgTW9kaWZp Y2F0aW9ucyIpLAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFu YWdlci5zZXRCcmVha3BvaW50LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2Vy LCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBl cy5TdWJ0cmVlTW9kaWZpZWQpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIG9uIEF0dHJpYnV0ZXMgTW9kaWZpY2F0aW9ucyIp LAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5zZXRC cmVha3BvaW50LmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLCB0aGlzLnJl cHJlc2VudGVkT2JqZWN0LCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5UeXBlcy5BdHRyaWJ1 dGVNb2RpZmllZCkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlN0b3Agb24gTm9kZSBSZW1vdmFsIiksCi0gICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9pbnQuYmluZChXZWJJ bnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50ZWRPYmplY3QsIFdl Ykluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLk5vZGVSZW1vdmVkKSk7Ci0KLSAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUg QnJlYWtwb2ludHMiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2lu dE1hbmFnZXIucmVtb3ZlQnJlYWtwb2ludHNGb3JOb2RlLmJpbmQoV2ViSW5zcGVjdG9yLmRvbUJy ZWFrcG9pbnRNYW5hZ2VyLCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0KSk7CisgICAgICAgICAgICBm b3IgKHZhciB0eXBlIGluIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzKSB7CisgICAg ICAgICAgICAgICAgdmFyIHR5cGVJZCA9IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVz W3R5cGVdOworICAgICAgICAgICAgICAgIHZhciBsYWJlbCA9IFdlYkluc3BlY3Rvci5ET01CcmVh a3BvaW50LkNvbnRleHRNZW51TGFiZWxzW3R5cGVJZF07CisgICAgICAgICAgICAgICAgdmFyIGJy ZWFrcG9pbnQgPSBXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIuZmluZEJyZWFrcG9p bnQodGhpcy5yZXByZXNlbnRlZE9iamVjdC5pZCwgdHlwZUlkKTsKKyAgICAgICAgICAgICAgICBp ZiAoIWJyZWFrcG9pbnQpCisgICAgICAgICAgICAgICAgICAgIHZhciBoYW5kbGVyID0gV2ViSW5z cGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9pbnQuYmluZChXZWJJbnNwZWN0 b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50ZWRPYmplY3QsIHR5cGVJZCk7 CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2YXIgaGFuZGxlciA9 IGJyZWFrcG9pbnQucmVtb3ZlLmJpbmQoYnJlYWtwb2ludCk7CisgICAgICAgICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKGxhYmVsLCBoYW5kbGVyLCAhIWJyZWFrcG9pbnQp OworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMmUyYzU0Zi4uYjE4MGFiMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xNDQ2LDYgKzE0NDYsNyBAQCBXZWJJ bnNwZWN0b3IuZmFpbGVkVG9QYXJzZVNjcmlwdFNvdXJjZSA9IGZ1bmN0aW9uKHNvdXJjZVVSTCwg c291cmNlLCBzdGFydGluZ0xpbgogV2ViSW5zcGVjdG9yLnBhdXNlZFNjcmlwdCA9IGZ1bmN0aW9u KGNhbGxGcmFtZXMpCiB7CiAgICAgdGhpcy5wYW5lbHMuc2NyaXB0cy5kZWJ1Z2dlclBhdXNlZChj YWxsRnJhbWVzKTsKKyAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7CiB9 CiAKIFdlYkluc3BlY3Rvci5yZXN1bWVkU2NyaXB0ID0gZnVuY3Rpb24oKQo= 65574 2010-08-26 09:14:55 -0700 2010-08-26 09:21:42 -0700 Proposed patch. context_menu.patch text/plain 7846 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWVhMjgzOS4uMGRhN2FkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMC0wOC0yNiAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiB1c2UgY29udGV4dCBtZW51IGl0 ZW1zIHdpdGggY2hlY2tib3ggZm9yIHNldHRpbmcgYW5kIHJlbW92aW5nIERPTSBicmVha3BvaW50 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2ODcK KworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludEl0ZW0pOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2lu dE1hbmFnZXIucHJvdG90eXBlLmZpbmRCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5ET01CcmVha3BvaW50LmxhYmVsRm9yVHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9N QnJlYWtwb2ludC5jb250ZXh0TWVudUxhYmVsRm9yVHlwZSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLl9wb3B1bGF0ZVRhZ0NvbnRleHRNZW51KToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5wYXVzZWRTY3JpcHQpOgorCisyMDEwLTA4LTI2ICBQYXZlbCBQb2Rpdmlsb3Yg IDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZl bGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZW5hYmxlIGRlYnVnZ2VyIGFmdGVyIHJl c291cmNlcyBhcmUgcHVzaGVkIHRvIGZyb250LWVuZApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9Fbmds aXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwppbmRleCAzOGQyNTU3YzgzM2JmZTNjNDliNDJmNzU5OWY0OGRlM2Qw M2M0NzhjLi44ZTdmYmJmNzZiODYwYzM0NTMxZjI1MDUwZDZlN2E4Y2EwM2Y1OTRkIDEwMDY0NApH SVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEzMgp6Y21aMj5mb2FRbXJWV2ZybFFwfHRJR3FAWjcqWkok OEx9czliWCFrZS0+cmNwYTw1dyNne000T1IwPiZzUmdiQX4KeUVRMTFyRWY2YSlBV1R9LTZUQTds cUxLSUgpNDRwR0h8SkshUFBYbjlvNk90Skg8YGJPWkxAWG5ZYmdNSyoodFJFCgpkZWx0YSAxMTkK emNtZG1Ub0B2PHlyVldmcmxVTF8pWlRfbik9Uk5zK3AyKzBDJTZ5WTI9UDZCPVNKQnpibj9GZipH UDlCc2RvVilACnVMcTA+bkJxaSZ+KGxhJCsre3F1NWxxY1UrO3pIdGshYFZIYHJqeENhPGEoNTJI JjUtNm1qKGRicWJEZjwKCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv QnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9C cmVha3BvaW50c1NpZGViYXJQYW5lLmpzCmluZGV4IGNjZjQ1YjYuLjNhMDg2MGYgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpz CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5l LmpzCkBAIC0xOTEsNyArMTkxLDcgQEAgV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnRJdGVtID0g ZnVuY3Rpb24oYnJlYWtwb2ludCkKICAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rvci5wYW5lbHMu ZWxlbWVudHMubGlua2lmeU5vZGVSZWZlcmVuY2UodGhpcy5fYnJlYWtwb2ludC5ub2RlKTsKICAg ICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKGxpbmspOwogCi0gICAgdmFyIHR5cGUgPSBXZWJJ bnNwZWN0b3IuRE9NQnJlYWtwb2ludC5MYWJlbHNbdGhpcy5fYnJlYWtwb2ludC50eXBlXTsKKyAg ICB2YXIgdHlwZSA9IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LmxhYmVsRm9yVHlwZSh0aGlz Ll9icmVha3BvaW50LnR5cGUpOwogICAgIHZhciB0eXBlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKCIgLSAiICsgdHlwZSk7CiAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0 eXBlRWxlbWVudCk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQWdlbnQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKaW5k ZXggYmQ1MjIzNS4uODNkYzg5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTUFnZW50LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2Vu dC5qcwpAQCAtNjkyLDYgKzY5MiwxMyBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludE1hbmFn ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycygi ZG9tLWJyZWFrcG9pbnQtYWRkZWQiLCBicmVha3BvaW50KTsKICAgICB9LAogCisgICAgZmluZEJy ZWFrcG9pbnQ6IGZ1bmN0aW9uKG5vZGVJZCwgdHlwZSkKKyAgICB7CisgICAgICAgIHZhciBub2Rl QnJlYWtwb2ludHMgPSB0aGlzLl9icmVha3BvaW50c1tub2RlSWRdOworICAgICAgICBpZiAobm9k ZUJyZWFrcG9pbnRzICYmIHR5cGUgaW4gbm9kZUJyZWFrcG9pbnRzKQorICAgICAgICAgICAgcmV0 dXJuIG5vZGVCcmVha3BvaW50c1t0eXBlXTsKKyAgICB9LAorCiAgICAgcmVtb3ZlQnJlYWtwb2lu dHNGb3JOb2RlOiBmdW5jdGlvbihub2RlKQogICAgIHsKICAgICAgICAgdmFyIG5vZGVCcmVha3Bv aW50cyA9IHRoaXMuX2JyZWFrcG9pbnRzW25vZGUuaWRdOwpAQCAtNzI4LDEwICs3MzUsMjcgQEAg V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMgPSB7CiAgICAgTm9kZVJlbW92ZWQ6IDIK IH07CiAKLVdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LkxhYmVscyA9IHt9OwotV2ViSW5zcGVj dG9yLkRPTUJyZWFrcG9pbnQuTGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVz LlN1YnRyZWVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN1YnRyZWUgTW9kaWZp ZWQiKTsKLVdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LkxhYmVsc1tXZWJJbnNwZWN0b3IuRE9N QnJlYWtwb2ludC5UeXBlcy5BdHRyaWJ1dGVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIkF0dHJpYnV0ZSBNb2RpZmllZCIpOwotV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuTGFi ZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLk5vZGVSZW1vdmVkXSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiTm9kZSBSZW1vdmVkIik7CitXZWJJbnNwZWN0b3IuRE9NQnJlYWtw b2ludC5sYWJlbEZvclR5cGUgPSBmdW5jdGlvbih0eXBlKQoreworICAgIGlmICghV2ViSW5zcGVj dG9yLkRPTUJyZWFrcG9pbnQuX2xhYmVscykgeworICAgICAgICBXZWJJbnNwZWN0b3IuRE9NQnJl YWtwb2ludC5fbGFiZWxzID0ge307CisgICAgICAgIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50 Ll9sYWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuU3VidHJlZU1vZGlmaWVk XSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3VidHJlZSBNb2RpZmllZCIpOworICAgICAgICBX ZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5fbGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3Bv aW50LlR5cGVzLkF0dHJpYnV0ZU1vZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQXR0 cmlidXRlIE1vZGlmaWVkIik7CisgICAgICAgIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50Ll9s YWJlbHNbV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuTm9kZVJlbW92ZWRdID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJOb2RlIFJlbW92ZWQiKTsKKyAgICB9CisgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5ET01CcmVha3BvaW50Ll9sYWJlbHNbdHlwZV07Cit9CisKK1dlYkluc3BlY3Rv ci5ET01CcmVha3BvaW50LmNvbnRleHRNZW51TGFiZWxGb3JUeXBlID0gZnVuY3Rpb24odHlwZSkK K3sKKyAgICBpZiAoIVdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50Ll9jb250ZXh0TWVudUxhYmVs cykgeworICAgICAgICBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5fY29udGV4dE1lbnVMYWJl bHMgPSB7fTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuX2NvbnRleHRNZW51 TGFiZWxzW1dlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2RpZmllZF0g PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJyZWFrIG9uIFN1YnRyZWUgTW9kaWZpY2F0aW9ucyIp OworICAgICAgICBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5fY29udGV4dE1lbnVMYWJlbHNb V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMuQXR0cmlidXRlTW9kaWZpZWRdID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJCcmVhayBvbiBBdHRyaWJ1dGVzIE1vZGlmaWNhdGlvbnMiKTsK KyAgICAgICAgV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuX2NvbnRleHRNZW51TGFiZWxzW1dl Ykluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLk5vZGVSZW1vdmVkXSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQnJlYWsgb24gTm9kZSBSZW1vdmFsIik7CisgICAgfQorICAgIHJldHVybiBX ZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludC5fY29udGV4dE1lbnVMYWJlbHNbdHlwZV07Cit9CiAK IFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LnByb3RvdHlwZSA9IHsKICAgICBnZXQgZW5hYmxl ZCgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVl T3V0bGluZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzCmluZGV4IGFlOWU0MGEuLjY5YzFkMjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC03NjUsMTYgKzc2NSwxNiBA QCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAg IGlmIChQcmVmZXJlbmNlcy5kb21CcmVha3BvaW50c0VuYWJsZWQpIHsKICAgICAgICAgICAgIC8v IEFkZCBkZWJidWdpbmctcmVsYXRlZCBhY3Rpb25zCiAgICAgICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRTZXBhcmF0b3IoKTsKLQotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0b3Agb24gU3VidHJlZSBNb2RpZmljYXRpb25zIiksCi0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFr cG9pbnQuYmluZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVz ZW50ZWRPYmplY3QsIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLlN1YnRyZWVNb2Rp ZmllZCkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlN0b3Agb24gQXR0cmlidXRlcyBNb2RpZmljYXRpb25zIiksCi0gICAgICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLmRvbUJyZWFrcG9pbnRNYW5hZ2VyLnNldEJyZWFrcG9pbnQuYmlu ZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFnZXIsIHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QsIFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50LlR5cGVzLkF0dHJpYnV0ZU1vZGlmaWVkKSk7 Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU3RvcCBvbiBOb2RlIFJlbW92YWwiKSwKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21C cmVha3BvaW50TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgV2ViSW5zcGVjdG9yLkRP TUJyZWFrcG9pbnQuVHlwZXMuTm9kZVJlbW92ZWQpKTsKLQotICAgICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlbW92ZSBCcmVha3BvaW50cyIp LAotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5yZW1v dmVCcmVha3BvaW50c0Zvck5vZGUuYmluZChXZWJJbnNwZWN0b3IuZG9tQnJlYWtwb2ludE1hbmFn ZXIsIHRoaXMucmVwcmVzZW50ZWRPYmplY3QpKTsKKyAgICAgICAgICAgIGZvciAodmFyIHR5cGUg aW4gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXMpIHsKKyAgICAgICAgICAgICAgICB2 YXIgdHlwZUlkID0gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuVHlwZXNbdHlwZV07CisgICAg ICAgICAgICAgICAgdmFyIGxhYmVsID0gV2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnQuY29udGV4 dE1lbnVMYWJlbEZvclR5cGUodHlwZUlkKTsKKyAgICAgICAgICAgICAgICB2YXIgYnJlYWtwb2lu dCA9IFdlYkluc3BlY3Rvci5kb21CcmVha3BvaW50TWFuYWdlci5maW5kQnJlYWtwb2ludCh0aGlz LnJlcHJlc2VudGVkT2JqZWN0LmlkLCB0eXBlSWQpOworICAgICAgICAgICAgICAgIGlmICghYnJl YWtwb2ludCkKKyAgICAgICAgICAgICAgICAgICAgdmFyIGhhbmRsZXIgPSBXZWJJbnNwZWN0b3Iu ZG9tQnJlYWtwb2ludE1hbmFnZXIuc2V0QnJlYWtwb2ludC5iaW5kKFdlYkluc3BlY3Rvci5kb21C cmVha3BvaW50TWFuYWdlciwgdGhpcy5yZXByZXNlbnRlZE9iamVjdCwgdHlwZUlkKTsKKyAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHZhciBoYW5kbGVyID0gYnJlYWtw b2ludC5yZW1vdmUuYmluZChicmVha3BvaW50KTsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRDaGVja2JveEl0ZW0obGFiZWwsIGhhbmRsZXIsICEhYnJlYWtwb2ludCk7CisgICAg ICAgICAgICB9CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwppbmRleCAyZTJjNTRmLi5iMTgwYWIwIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTE0NDYsNiArMTQ0Niw3IEBAIFdlYkluc3BlY3Rv ci5mYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlID0gZnVuY3Rpb24oc291cmNlVVJMLCBzb3VyY2Us IHN0YXJ0aW5nTGluCiBXZWJJbnNwZWN0b3IucGF1c2VkU2NyaXB0ID0gZnVuY3Rpb24oY2FsbEZy YW1lcykKIHsKICAgICB0aGlzLnBhbmVscy5zY3JpcHRzLmRlYnVnZ2VyUGF1c2VkKGNhbGxGcmFt ZXMpOworICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5icmluZ1RvRnJvbnQoKTsKIH0KIAogV2Vi SW5zcGVjdG9yLnJlc3VtZWRTY3JpcHQgPSBmdW5jdGlvbigpCg==