76636 2012-01-19 07:51:06 -0800 Web Inspector: Switching tabs in TabbedEditorContainer should reveal selected script in navigator. 2012-01-19 10:57:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 538704 0 vsevik 2012-01-19 07:51:06 -0800 Switching tabs in TabbedEditorContainer should reveal selected script in navigator. 538711 1 123130 vsevik 2012-01-19 07:57:14 -0800 Created attachment 123130 Patch 538712 2 vsevik 2012-01-19 07:57:28 -0800 - Renamed FileSelector's ScriptSelected event into FileSelected, added EditorSelected event to EditorContainer. - Renamed _showSourceFrame into _showFile. - Made _uiSourceCodeRemoved reuse _removeSourceFrame. 538762 3 123130 apavlov 2012-01-19 09:31:05 -0800 Comment on attachment 123130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123130&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:92 > + this._editorContainer.addEventListener(WebInspector.ScriptsPanel.EditorContainer.Events.EditorSelected, this._editorSelected, this); EditorActivated? Seems like selection assumes subsequent manipulation on the selected object (move, rename, delete, etc.) 538808 4 vsevik 2012-01-19 10:57:19 -0800 Committed r105427: <http://trac.webkit.org/changeset/105427> 123130 2012-01-19 07:57:14 -0800 2012-01-19 09:31:04 -0800 Patch bug-76636-20120119195712.patch text/plain 10638 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYwZDkwY2I3NGNkNDY4 ZjQyOTZlMTE1NDUwYTIxOTJkNzQ1Zjk4NC4uMzYzYTAxYjA5ZmNlYTBiYjQ0ZGNiNWYwOGUwNTVk M2M0NGJjY2Y1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTAxLTE5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFN3aXRjaGluZyB0YWJzIGluIFRhYmJlZEVkaXRvckNvbnRhaW5lciBzaG91bGQgcmV2ZWFs IHNlbGVjdGVkIHNjcmlwdCBpbiBuYXZpZ2F0b3IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjYzNgorCisgICAgICAgIFJlbmFtZWQgRmlsZVNlbGVj dG9yJ3MgU2NyaXB0U2VsZWN0ZWQgZXZlbnQgaW50byBGaWxlU2VsZWN0ZWQsIGFkZGVkIEVkaXRv clNlbGVjdGVkCisgICAgICAgIGV2ZW50IHRvIEVkaXRvckNvbnRhaW5lci4KKyAgICAgICAgUmVu YW1lZCBfc2hvd1NvdXJjZUZyYW1lIGludG8gX3Nob3dGaWxlLgorICAgICAgICBNYWRlIF91aVNv dXJjZUNvZGVSZW1vdmVkIHJldXNlIF9yZW1vdmVTb3VyY2VGcmFtZS4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c05hdmlnYXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLnByb3RvdHlwZS5zY3JpcHRTZWxlY3RlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZS5fdWlTb3VyY2VDb2RlUmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd0FuZFJldmVhbEluRmlsZVNlbGVjdG9yKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9lZGl0b3JTZWxlY3Rl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fZmlsZVNl bGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29tYm9Cb3hGaWxl U2VsZWN0b3IucHJvdG90eXBlLl9nb0JhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5Db21ib0JveEZpbGVTZWxlY3Rvci5wcm90b3R5cGUuX2dvRm9yd2FyZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3Rv dHlwZS5fZmlsZXNTZWxlY3RDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1RhYmJlZEVkaXRvckNvbnRhaW5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRF ZGl0b3JDb250YWluZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRh aW5lci5wcm90b3R5cGUuX3RhYlNlbGVjdGVkKToKKworMjAxMi0wMS0xOSAgVnNldm9sb2QgVmxh c292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBy b3ZlIGZvY3VzIHN3aXRjaGluZyBpbiBzY3JpcHRzIHBhbmVsLgogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY2MjgKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmluZGV4IGIw N2QwY2RhMDA3YzlhYzEzZmNlMDY4MmEwZWZmYWYzZTMzZDc4YmEuLjA5YjlmNzMxMTVhY2I5NzAx ODg2ZjFkNjA4MWViOWU0MGI2MzZhYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKQEAgLTE3MCw3ICsxNzAsNyBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUgPSB7CiAgICAgc2NyaXB0 U2VsZWN0ZWQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKICAgICB7CiAgICAgICAgIHRoaXMuX2xh c3RTZWxlY3RlZFVJU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKLSAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0 b3IuRXZlbnRzLlNjcmlwdFNlbGVjdGVkLCB1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxl Y3Rvci5FdmVudHMuRmlsZVNlbGVjdGVkLCB1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAgICAgCiAg ICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCmluZGV4IGQ1YzMyNDliZjQ2YjlmMTEwY2Q2MTU5YjNjNTljZTVmZGQ4Y2EzODgu LmEwNjdjYmRhYWFiNDczNWM3MmUzMjhkNjY5M2M2NzhiMDNkYjhjODUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC03MCw3 ICs3MCw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRp b25Nb2RlbCkKICAgICAgICAgdGhpcy5lZGl0b3JWaWV3LnNob3codGhpcy5zcGxpdFZpZXcubWFp bkVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX2ZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0 b3IuU2NyaXB0c05hdmlnYXRvcih0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7Ci0gICAgICAgIHRo aXMuX2ZpbGVTZWxlY3Rvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5TY3JpcHRTZWxlY3RlZCwgdGhpcy5fc2NyaXB0U2VsZWN0 ZWQsIHRoaXMpCiAKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnNob3codGhpcy5lZGl0b3JW aWV3LnNpZGViYXJFbGVtZW50KTsKIApAQCAtODMsMTMgKzgyLDE1IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICAgICAgdGhpcy5f ZWRpdG9yQ29udGFpbmVyLnNob3codGhpcy5lZGl0b3JWaWV3Lm1haW5FbGVtZW50KTsKICAgICB9 IGVsc2UgewogICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5Db21ib0JveEZpbGVTZWxlY3Rvcih0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCk7 Ci0gICAgICAgIHRoaXMuX2ZpbGVTZWxlY3Rvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5TY3JpcHRTZWxlY3RlZCwgdGhpcy5f c2NyaXB0U2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3IuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMu UmVsZWFzZWRGb2N1c0FmdGVyU2VsZWN0aW9uLCB0aGlzLl9maWxlU2VsZWN0b3JSZWxlYXNlZEZv Y3VzLCB0aGlzKTsKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnNob3codGhpcy5zcGxpdFZp ZXcubWFpbkVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lciA9IG5ldyBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlNpbmdsZUZpbGVFZGl0b3JDb250YWluZXIoKTsKICAg ICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNob3codGhpcy5zcGxpdFZpZXcubWFpbkVsZW1l bnQpOwogICAgIH0KKyAgICB0aGlzLl9maWxlU2VsZWN0b3IuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMuRmlsZVNlbGVjdGVkLCB0 aGlzLl9maWxlU2VsZWN0ZWQsIHRoaXMpOworICAgIHRoaXMuX2ZpbGVTZWxlY3Rvci5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5S ZWxlYXNlZEZvY3VzQWZ0ZXJTZWxlY3Rpb24sIHRoaXMuX2ZpbGVTZWxlY3RvclJlbGVhc2VkRm9j dXMsIHRoaXMpOworICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRWRpdG9yQ29udGFpbmVyLkV2ZW50cy5FZGl0b3JTZWxl Y3RlZCwgdGhpcy5fZWRpdG9yU2VsZWN0ZWQsIHRoaXMpOworCiAgICAgdGhpcy5zcGxpdFZpZXcu bWFpbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kZWJ1Z1NpZGViYXJSZXNpemVXaWRnZXRFbGVt ZW50KTsKIAogICAgIHRoaXMuc2lkZWJhclBhbmVzID0ge307CkBAIC0yNzAsMTEgKzI3MSw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIF91aVNvdXJjZUNv ZGVSZW1vdmVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7 Ci0KLSAgICAgICAgaWYgKHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLmdldCh1aVNv dXJjZUNvZGUpKSB7Ci0gICAgICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZXNCeVVJU291cmNlQ29k ZS5nZXQodWlTb3VyY2VDb2RlKS5kZXRhY2goKTsKLSAgICAgICAgICAgIHRoaXMuX3NvdXJjZUZy YW1lc0J5VUlTb3VyY2VDb2RlLnJlbW92ZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICB9CisgICAg ICAgIHRoaXMuX3JlbW92ZVNvdXJjZUZyYW1lKHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAogICAg IC8qKgpAQCAtNDg0LDcgKzQ4MSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlID0gewogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3Vy Y2VDb2RlCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfQogICAgICAq LwotICAgIF9zaG93U291cmNlRnJhbWU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICBfc2hv d0ZpbGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKICAgICB7CiAgICAgICAgIHZhciBzb3VyY2VG cmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLmdldCh1aVNvdXJjZUNvZGUp IHx8IHRoaXMuX2NyZWF0ZVNvdXJjZUZyYW1lKHVpU291cmNlQ29kZSk7CiAKQEAgLTUwNyw3ICs1 MDQsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHJldHVybiBudWxsOwogICAgICAgICAKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnJl dmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICByZXR1cm4gdGhpcy5fc2hv d1NvdXJjZUZyYW1lKHVpU291cmNlQ29kZSk7CisgICAgICAgIHJldHVybiB0aGlzLl9zaG93Rmls ZSh1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICByZXF1ZXN0VmlzaWJsZVNjcmlwdE91dGxp bmU6IGZ1bmN0aW9uKCkKQEAgLTY1OCwxMCArNjU1LDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVFeGVjdXRpb25MaW5lKHRo aXMuX3ByZXNlbnRhdGlvbk1vZGVsLmV4ZWN1dGlvbkxpbmVMb2NhdGlvbik7CiAgICAgfSwKIAot ICAgIF9zY3JpcHRTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX2VkaXRvclNlbGVjdGVk OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IC8qKiBA dHlwZSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfSAqLyBldmVudC5kYXRhOworICAgICAgICB0 aGlzLl9maWxlU2VsZWN0b3IucmV2ZWFsVUlTb3VyY2VDb2RlKHNvdXJjZUZyYW1lLl91aVNvdXJj ZUNvZGUpOworICAgIH0sCisKKyAgICBfZmlsZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7Ci0gICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFt ZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9zaG93RmlsZSh1aVNvdXJjZUNvZGUpOwog ICAgIH0sCiAKICAgICBfZmlsZVNlbGVjdG9yUmVsZWFzZWRGb2N1czogZnVuY3Rpb24oZXZlbnQp CkBAIC0xMDM1LDcgKzEwMzgsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlOwogV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0b3IgPSBmdW5jdGlvbigpIHsgfQogCiBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMgPSB7Ci0gICAgU2NyaXB0U2VsZWN0 ZWQ6ICJTY3JpcHRTZWxlY3RlZCIsCisgICAgRmlsZVNlbGVjdGVkOiAiRmlsZVNlbGVjdGVkIiwK ICAgICBSZWxlYXNlZEZvY3VzQWZ0ZXJTZWxlY3Rpb246ICJSZWxlYXNlZEZvY3VzQWZ0ZXJTZWxl Y3Rpb24iCiB9CiAKQEAgLTEwODQsNiArMTA4NywxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLkZpbGVTZWxlY3Rvci5wcm90b3R5cGUgPSB7CiAgKi8KIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwuRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24oKSB7IH0KIAorV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5FZGl0b3JDb250YWluZXIuRXZlbnRzID0geworICAgIEZpbGVTZWxlY3RlZDog IkZpbGVTZWxlY3RlZCIKK30KKwogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5FZGl0b3JDb250 YWluZXIucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEB0eXBlIHtXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWV9CkBAIC0xNDQwLDcgKzE0NDcsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgdWlT b3VyY2VDb2RlID0gdGhpcy5fYmFja0ZvcndhcmRMaXN0Wy0tdGhpcy5fY3VycmVudEJhY2tGb3J3 YXJkSW5kZXhdOwogICAgICAgICB0aGlzLl9pbm5lclJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJj ZUNvZGUsIGZhbHNlKTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0b3IuRXZlbnRzLlNjcmlwdFNlbGVjdGVk LCB1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMuRmlsZVNlbGVjdGVk LCB1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICBfZ29Gb3J3YXJkOiBmdW5jdGlvbigpCkBA IC0xNDUyLDcgKzE0NTksNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94Rmls ZVNlbGVjdG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhp cy5fYmFja0ZvcndhcmRMaXN0WysrdGhpcy5fY3VycmVudEJhY2tGb3J3YXJkSW5kZXhdOwogICAg ICAgICB0aGlzLl9pbm5lclJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUsIGZhbHNlKTsK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5GaWxlU2VsZWN0b3IuRXZlbnRzLlNjcmlwdFNlbGVjdGVkLCB1aVNvdXJjZUNvZGUp OworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMuRmlsZVNlbGVjdGVkLCB1aVNvdXJjZUNvZGUp OwogICAgIH0sCiAKICAgICAvKioKQEAgLTE0NjUsNyArMTQ3Miw3IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwuQ29tYm9Cb3hGaWxlU2VsZWN0b3IucHJvdG90eXBlID0gewogCiAgICAgICAg IHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnRbdGhpcy5fZmlsZXNT ZWxlY3RFbGVtZW50LnNlbGVjdGVkSW5kZXhdLl91aVNvdXJjZUNvZGU7CiAgICAgICAgIHRoaXMu X2lubmVyUmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSwgdHJ1ZSk7Ci0gICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmls ZVNlbGVjdG9yLkV2ZW50cy5TY3JpcHRTZWxlY3RlZCwgdWlTb3VyY2VDb2RlKTsKKyAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5G aWxlU2VsZWN0b3IuRXZlbnRzLkZpbGVTZWxlY3RlZCwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAg aWYgKGZvY3VzU291cmNlKQogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0b3IuRXZlbnRzLlJlbGVhc2Vk Rm9jdXNBZnRlclNlbGVjdGlvbiwgdWlTb3VyY2VDb2RlKTsKICAgICB9CkBAIC0xNTYwLDUgKzE1 NjcsNCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlNpbmdsZUZpbGVFZGl0b3JDb250YWlu ZXIucHJvdG90eXBlID0gewogICAgIH0KIH0KIAotCiBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LlNpbmdsZUZpbGVFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5PYmplY3QucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwppbmRleCA0ODY0NTNh NGE2MWVjMmM4NmNlNTQ2ODA5MTcwMDE5M2E4OWMwOWY0Li5lODFlM2JmZjVjZWZmZWY0MTQwZDIx ODk3NTY5ZWQzMTRlOTNkOWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwpAQCAtMzcsNiArMzcs NyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24oKQogICAg IHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5pZCA9ICJzY3JpcHRzLWVkaXRvci1jb250YWluZXIt dGFiYmVkLXBhbmUiOwogCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hZGRFdmVudExpc3RlbmVyKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lLkV2ZW50VHlwZXMuVGFiQ2xvc2VkLCB0aGlzLl90YWJDbG9z ZWQsIHRoaXMpOworICAgIHRoaXMuX3RhYmJlZFBhbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVGFiYmVkUGFuZS5FdmVudFR5cGVzLlRhYlNlbGVjdGVkLCB0aGlzLl90YWJTZWxlY3Rl ZCwgdGhpcyk7CiAKICAgICB0aGlzLl90aXRsZXMgPSBuZXcgTWFwKCk7CiAgICAgdGhpcy5fdG9v bHRpcHMgPSBuZXcgTWFwKCk7CkBAIC0xMTIsNiArMTEzLDE1IEBAIFdlYkluc3BlY3Rvci5UYWJi ZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKKyAgICAgKi8KKyAgICBfdGFiU2Vs ZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0g LyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhLnZpZXc7 CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwuRWRpdG9yQ29udGFpbmVyLkV2ZW50cy5FZGl0b3JTZWxlY3RlZCwgc291cmNlRnJh bWUpOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZX0gb2xkU291cmNlRnJhbWUKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGl0bGUKICAg ICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUKQEAgLTIw MCwzICsyMTAsNSBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuICJ0YWJfIiArIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9y Q29udGFpbmVyLl90YWJJZCsrKTsKICAgICB9CiB9CisKK1dlYkluc3BlY3Rvci5UYWJiZWRFZGl0 b3JDb250YWluZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJv dG90eXBlOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK