165745 2016-12-11 18:16:20 -0800 Web Inspector: Cleanup HierarchicalPathComponent 2016-12-12 10:18:43 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1258943 0 mattbaker 2016-12-11 18:16:20 -0800 Modernize and tidy up code, remove single use CSS class name constants, and back all properties by the model not the DOM. 1258946 1 296888 mattbaker 2016-12-11 18:23:54 -0800 Created attachment 296888 Patch 1259062 2 296888 bburg 2016-12-12 09:22:13 -0800 Comment on attachment 296888 Patch r=me 1259063 3 296888 commit-queue 2016-12-12 09:24:36 -0800 Comment on attachment 296888 Patch Clearing flags on attachment: 296888 Committed r209711: <http://trac.webkit.org/changeset/209711> 1259064 4 commit-queue 2016-12-12 09:24:39 -0800 All reviewed patches have been landed. Closing bug. 1259099 5 296888 joepeck 2016-12-12 10:16:21 -0800 Comment on attachment 296888 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296888&action=review > Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js:96 > + get element() { return this._element; } > + get representedObject() { return this._representedObject; } I still think we shouldn't have one line getters/setters in the middle of a list of getters/setters. I think they should be at the top. 1259104 6 bburg 2016-12-12 10:18:43 -0800 (In reply to comment #5) > Comment on attachment 296888 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=296888&action=review > > > Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.js:96 > > + get element() { return this._element; } > > + get representedObject() { return this._representedObject; } > > I still think we shouldn't have one line getters/setters in the middle of a > list of getters/setters. I think they should be at the top. I am indifferent. Can you update the style guide if it's not in there already? 296888 2016-12-11 18:23:54 -0800 2016-12-12 09:24:36 -0800 Patch bug-165745-20161211182307.patch text/plain 11812 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5Njk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl M2E1OTkyZDgzNWNmYjEyY2M1NDg1YTJjMWFiN2Y2NmI3ZjI1MTllLi42MDE0YTRhYzM3NTA1OWUz M2Q1MzQ4NjBiMDc4MDY4ZGVlNDY2NGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxNi0xMi0xMSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xlYW51cCBIaWVyYXJjaGljYWxQYXRoQ29tcG9u ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU3 NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmVm ZXIgdG9nZ2xlIGZvciBzdHlsZSBjbGFzcyBuYW1lcywgcmVtb3ZlIHNpbmdsZSB1c2UgQ1NTIGNs YXNzIG5hbWUKKyAgICAgICAgY29uc3RhbnRzLCBhbmQgYmFjayBhbGwgcHJvcGVydGllcyBieSB0 aGUgbW9kZWwgbm90IHRoZSBET00uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0hp ZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2Fs UGF0aENvbXBvbmVudC5wcm90b3R5cGUuZ2V0IGVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQucHJvdG90eXBlLmdldCByZXByZXNlbnRlZE9i amVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5w cm90b3R5cGUuZ2V0IG1pbmltdW1XaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudC5wcm90b3R5cGUuZ2V0IGZvcmNlZFdpZHRoKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LnByb3RvdHlwZS5zZXQgZm9y Y2VkV2lkdGgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25l bnQucHJvdG90eXBlLmdldCBoaWRkZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNo aWNhbFBhdGhDb21wb25lbnQucHJvdG90eXBlLnNldCBoaWRkZW4pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQucHJvdG90eXBlLmdldCBjb2xsYXBzZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQucHJvdG90 eXBlLnNldCBjb2xsYXBzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBh dGhDb21wb25lbnQucHJvdG90eXBlLmdldCBzZWxlY3RvckFycm93cyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5wcm90b3R5cGUuc2V0IHNlbGVjdG9y QXJyb3dzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50 LnByb3RvdHlwZS5nZXQgcHJldmlvdXNTaWJsaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I aWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LnByb3RvdHlwZS5zZXQgcHJldmlvdXNTaWJsaW5nKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LnByb3RvdHlw ZS5nZXQgbmV4dFNpYmxpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBh dGhDb21wb25lbnQucHJvdG90eXBlLnNldCBuZXh0U2libGluZyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5wcm90b3R5cGUuX3VwZGF0ZUVsZW1lbnRU aXRsZUFuZFRleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21w b25lbnQucHJvdG90eXBlLl91cGRhdGVTZWxlY3RFbGVtZW50LmNyZWF0ZU9wdGlvbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5wcm90b3R5cGUuX3Vw ZGF0ZVNlbGVjdEVsZW1lbnQpOgorCiAyMDE2LTEyLTExICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTW92ZSBNYWluVGFyZ2V0 IGFuZCBXb3JrZXJUYXJnZXQgdG8gdGhlaXIgb3duIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IaWVyYXJjaGljYWxQYXRoQ29tcG9u ZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudC5qcwppbmRleCAzNTE1MzEzODM5OTYyNzgwMGZlZDQxNjdhNmM2 ODNlMjU4ZmM3MWFlLi44NWQ4NGM4NDMyYzcxMWU4MzM2ZTQyMzU4YTEyZmMwMDZmMGYxMTk1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IaWVy YXJjaGljYWxQYXRoQ29tcG9uZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0hpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuanMKQEAgLTM3LDIxICsz NywxNyBAQCBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudCA9IGNsYXNzIEhp ZXJhcmNoaWNhbFBhdGhDb21wb25lbnQgZXh0ZW5kcwogICAgICAgICB0aGlzLl9lbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xh c3NOYW1lID0gImhpZXJhcmNoaWNhbC1wYXRoLWNvbXBvbmVudCI7CiAKLSAgICAgICAgaWYgKCEo c3R5bGVDbGFzc05hbWVzIGluc3RhbmNlb2YgQXJyYXkpKQorICAgICAgICBpZiAoIUFycmF5Lmlz QXJyYXkoc3R5bGVDbGFzc05hbWVzKSkKICAgICAgICAgICAgIHN0eWxlQ2xhc3NOYW1lcyA9IFtz dHlsZUNsYXNzTmFtZXNdOwogCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVDbGFz c05hbWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoIXN0eWxlQ2xhc3NOYW1lc1tp XSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQu Y2xhc3NMaXN0LmFkZChzdHlsZUNsYXNzTmFtZXNbaV0pOwotICAgICAgICB9CisgICAgICAgIHRo aXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZCguLi5zdHlsZUNsYXNzTmFtZXMpOwogCiAgICAgICAg IGlmICghdGV4dE9ubHkpIHsKICAgICAgICAgICAgIHRoaXMuX2ljb25FbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiaW1nIik7CiAgICAgICAgICAgICB0aGlzLl9pY29uRWxlbWVudC5j bGFzc05hbWUgPSAiaWNvbiI7CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX2ljb25FbGVtZW50KTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlzLl9l bGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25l bnQuVGV4dE9ubHlTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNs YXNzTGlzdC5hZGQoInRleHQtb25seSIpOwogCiAgICAgICAgIHRoaXMuX3RpdGxlRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLl90aXRsZUVsZW1l bnQuY2xhc3NOYW1lID0gInRpdGxlIjsKQEAgLTc4LDggKzc0LDEyIEBAIFdlYkluc3BlY3Rvci5I aWVyYXJjaGljYWxQYXRoQ29tcG9uZW50ID0gY2xhc3MgSGllcmFyY2hpY2FsUGF0aENvbXBvbmVu dCBleHRlbmRzCiAKICAgICAgICAgdGhpcy5fdHJ1bmNhdGVkRGlzcGxheU5hbWVMZW5ndGggPSAw OwogCi0gICAgICAgIHRoaXMuc2VsZWN0b3JBcnJvd3MgPSBzaG93U2VsZWN0b3JBcnJvd3M7Cisg ICAgICAgIHRoaXMuX2NvbGxhcHNlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9oaWRkZW4gPSBm YWxzZTsKKyAgICAgICAgdGhpcy5fc2VsZWN0b3JBcnJvd3MgPSBmYWxzZTsKKwogICAgICAgICB0 aGlzLmRpc3BsYXlOYW1lID0gZGlzcGxheU5hbWU7CisgICAgICAgIHRoaXMuc2VsZWN0b3JBcnJv d3MgPSBzaG93U2VsZWN0b3JBcnJvd3M7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC05Miwx NSArOTIsOCBAQCBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudCA9IGNsYXNz IEhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQgZXh0ZW5kcwogICAgICAgICByZXR1cm4gc2VsZWN0 ZWRPcHRpb24gJiYgc2VsZWN0ZWRPcHRpb24uX3BhdGhDb21wb25lbnQgfHwgbnVsbDsKICAgICB9 CiAKLSAgICBnZXQgZWxlbWVudCgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVu dDsKLSAgICB9Ci0KLSAgICBnZXQgcmVwcmVzZW50ZWRPYmplY3QoKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3JlcHJlc2VudGVkT2JqZWN0OwotICAgIH0KKyAgICBnZXQgZWxlbWVudCgp IHsgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7IH0KKyAgICBnZXQgcmVwcmVzZW50ZWRPYmplY3QoKSB7 IHJldHVybiB0aGlzLl9yZXByZXNlbnRlZE9iamVjdDsgfQogCiAgICAgZ2V0IGRpc3BsYXlOYW1l KCkKICAgICB7CkBAIC0xMzcsMTYgKzEzMCwxNiBAQCBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2Fs UGF0aENvbXBvbmVudCA9IGNsYXNzIEhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQgZXh0ZW5kcwog CiAgICAgZ2V0IG1pbmltdW1XaWR0aCgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5jb2xsYXBz ZWQpCisgICAgICAgIGlmICh0aGlzLl9jb2xsYXBzZWQpCiAgICAgICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuTWluaW11bVdpZHRoQ29sbGFwc2Vk OwotICAgICAgICBpZiAodGhpcy5zZWxlY3RvckFycm93cykKKyAgICAgICAgaWYgKHRoaXMuX3Nl bGVjdG9yQXJyb3dzKQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5IaWVyYXJjaGlj YWxQYXRoQ29tcG9uZW50Lk1pbmltdW1XaWR0aCArIFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQ YXRoQ29tcG9uZW50LlNlbGVjdG9yQXJyb3dzV2lkdGg7CiAgICAgICAgIHJldHVybiBXZWJJbnNw ZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5NaW5pbXVtV2lkdGg7CiAgICAgfQogCiAg ICAgZ2V0IGZvcmNlZFdpZHRoKCkKICAgICB7Ci0gICAgICAgIHZhciBtYXhXaWR0aCA9IHRoaXMu X2VsZW1lbnQuc3R5bGUuZ2V0UHJvcGVydHkoIndpZHRoIik7CisgICAgICAgIGxldCBtYXhXaWR0 aCA9IHRoaXMuX2VsZW1lbnQuc3R5bGUuZ2V0UHJvcGVydHkoIndpZHRoIik7CiAgICAgICAgIGlm ICh0eXBlb2YgbWF4V2lkdGggPT09ICJzdHJpbmciKQogICAgICAgICAgICAgcmV0dXJuIHBhcnNl SW50KG1heFdpZHRoKTsKICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC0xNTUsNyArMTQ4LDcgQEAg V2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQgPSBjbGFzcyBIaWVyYXJjaGlj YWxQYXRoQ29tcG9uZW50IGV4dGVuZHMKICAgICBzZXQgZm9yY2VkV2lkdGgod2lkdGgpCiAgICAg ewogICAgICAgICBpZiAodHlwZW9mIHdpZHRoID09PSAibnVtYmVyIikgewotICAgICAgICAgICAg dmFyIG1pbmltdW1XaWR0aEZvck9uZUNoYXJhY3RlclRydW5jYXRlZFRpdGxlID0gV2ViSW5zcGVj dG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuTWluaW11bVdpZHRoRm9yT25lQ2hhcmFjdGVy VHJ1bmNhdGVkVGl0bGU7CisgICAgICAgICAgICBsZXQgbWluaW11bVdpZHRoRm9yT25lQ2hhcmFj dGVyVHJ1bmNhdGVkVGl0bGUgPSBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVu dC5NaW5pbXVtV2lkdGhGb3JPbmVDaGFyYWN0ZXJUcnVuY2F0ZWRUaXRsZTsKICAgICAgICAgICAg IGlmICh0aGlzLnNlbGVjdG9yQXJyb3dzKQogICAgICAgICAgICAgICAgIG1pbmltdW1XaWR0aEZv ck9uZUNoYXJhY3RlclRydW5jYXRlZFRpdGxlICs9IFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQ YXRoQ29tcG9uZW50LlNlbGVjdG9yQXJyb3dzV2lkdGg7CiAKQEAgLTE3Myw3OCArMTY2LDY2IEBA IFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50ID0gY2xhc3MgSGllcmFyY2hp Y2FsUGF0aENvbXBvbmVudCBleHRlbmRzCiAKICAgICBnZXQgaGlkZGVuKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucyhXZWJJbnNwZWN0b3Iu SGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5IaWRkZW5TdHlsZUNsYXNzTmFtZSk7CisgICAgICAg IHJldHVybiB0aGlzLl9oaWRkZW47CiAgICAgfQogCiAgICAgc2V0IGhpZGRlbihmbGFnKQogICAg IHsKLSAgICAgICAgaWYgKGZsYWcpCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuSGlkZGVuU3R5bGVD bGFzc05hbWUpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuSGlkZGVu U3R5bGVDbGFzc05hbWUpOworICAgICAgICBpZiAodGhpcy5faGlkZGVuID09PSBmbGFnKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2hpZGRlbiA9IGZsYWc7CisgICAgICAg IHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiaGlkZGVuIiwgdGhpcy5faGlkZGVuKTsK ICAgICB9CiAKICAgICBnZXQgY29sbGFwc2VkKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz Ll9lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucyhXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0 aENvbXBvbmVudC5Db2xsYXBzZWRTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgIHJldHVybiB0aGlz Ll9jb2xsYXBzZWQ7CiAgICAgfQogCiAgICAgc2V0IGNvbGxhcHNlZChmbGFnKQogICAgIHsKLSAg ICAgICAgaWYgKGZsYWcpCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQo V2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuQ29sbGFwc2VkU3R5bGVDbGFz c05hbWUpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlz dC5yZW1vdmUoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuQ29sbGFwc2Vk U3R5bGVDbGFzc05hbWUpOworICAgICAgICBpZiAodGhpcy5fY29sbGFwc2VkID09PSBmbGFnKQor ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2NvbGxhcHNlZCA9IGZsYWc7Cisg ICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiY29sbGFwc2VkIiwgdGhpcy5f Y29sbGFwc2VkKTsKICAgICB9CiAKICAgICBnZXQgc2VsZWN0b3JBcnJvd3MoKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmNvbnRhaW5zKFdlYkluc3BlY3Rv ci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlNob3dTZWxlY3RvckFycm93c1N0eWxlQ2xhc3NO YW1lKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NlbGVjdG9yQXJyb3dzOwogICAgIH0KIAogICAg IHNldCBzZWxlY3RvckFycm93cyhmbGFnKQogICAgIHsKLSAgICAgICAgaWYgKGZsYWcpIHsKKyAg ICAgICAgaWYgKHRoaXMuX3NlbGVjdG9yQXJyb3dzID09PSBmbGFnKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIHRoaXMuX3NlbGVjdG9yQXJyb3dzID0gZmxhZzsKKworICAgICAgICBp ZiAodGhpcy5fc2VsZWN0b3JBcnJvd3MpIHsKICAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yQXJy b3dzRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICAgICAg dGhpcy5fc2VsZWN0b3JBcnJvd3NFbGVtZW50LmNsYXNzTmFtZSA9ICJzZWxlY3Rvci1hcnJvd3Mi OwogICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fc2VsZWN0b3JB cnJvd3NFbGVtZW50LCB0aGlzLl9zZXBhcmF0b3JFbGVtZW50KTsKLQotICAgICAgICAgICAgdGhp cy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29t cG9uZW50LlNob3dTZWxlY3RvckFycm93c1N0eWxlQ2xhc3NOYW1lKTsKLSAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9zZWxlY3RvckFycm93c0VsZW1lbnQpIHsKLSAgICAg ICAgICAgICAgICB0aGlzLl9zZWxlY3RvckFycm93c0VsZW1lbnQucmVtb3ZlKCk7Ci0gICAgICAg ICAgICAgICAgZGVsZXRlIHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudDsKLSAgICAgICAgICAg IH0KLQotICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3Bl Y3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50LlNob3dTZWxlY3RvckFycm93c1N0eWxlQ2xh c3NOYW1lKTsKKyAgICAgICAgfSBlbHNlIGlmICh0aGlzLl9zZWxlY3RvckFycm93c0VsZW1lbnQp IHsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudC5yZW1vdmUoKTsKKyAg ICAgICAgICAgIHRoaXMuX3NlbGVjdG9yQXJyb3dzRWxlbWVudCA9IG51bGw7CiAgICAgICAgIH0K LSAgICB9CiAKLSAgICBnZXQgcHJldmlvdXNTaWJsaW5nKCkKLSAgICB7Ci0gICAgICAgIHJldHVy biB0aGlzLl9wcmV2aW91c1NpYmxpbmc7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0 LnRvZ2dsZSgic2hvdy1zZWxlY3Rvci1hcnJvd3MiLCB0aGlzLl9zZWxlY3RvckFycm93cyk7CiAg ICAgfQogCi0gICAgc2V0IHByZXZpb3VzU2libGluZyhuZXdTbGlibGluZykKLSAgICB7Ci0gICAg ICAgIHRoaXMuX3ByZXZpb3VzU2libGluZyA9IG5ld1NsaWJsaW5nIHx8IG51bGw7Ci0gICAgfQot Ci0gICAgZ2V0IG5leHRTaWJsaW5nKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9uZXh0 U2libGluZzsKLSAgICB9Ci0KLSAgICBzZXQgbmV4dFNpYmxpbmcobmV3U2xpYmxpbmcpCi0gICAg ewotICAgICAgICB0aGlzLl9uZXh0U2libGluZyA9IG5ld1NsaWJsaW5nIHx8IG51bGw7Ci0gICAg fQorICAgIGdldCBwcmV2aW91c1NpYmxpbmcoKSB7IHJldHVybiB0aGlzLl9wcmV2aW91c1NpYmxp bmc7IH0KKyAgICBzZXQgcHJldmlvdXNTaWJsaW5nKG5ld1NsaWJsaW5nKSB7IHRoaXMuX3ByZXZp b3VzU2libGluZyA9IG5ld1NsaWJsaW5nIHx8IG51bGw7IH0KKyAgICBnZXQgbmV4dFNpYmxpbmco KSB7IHJldHVybiB0aGlzLl9uZXh0U2libGluZzsgfQorICAgIHNldCBuZXh0U2libGluZyhuZXdT bGlibGluZykgeyB0aGlzLl9uZXh0U2libGluZyA9IG5ld1NsaWJsaW5nIHx8IG51bGw7IH0KIAog ICAgIC8vIFByaXZhdGUKIAogICAgIF91cGRhdGVFbGVtZW50VGl0bGVBbmRUZXh0KCkKICAgICB7 Ci0gICAgICAgIHZhciB0cnVuY2F0ZWREaXNwbGF5TmFtZSA9IHRoaXMuX2Rpc3BsYXlOYW1lOwor ICAgICAgICBsZXQgdHJ1bmNhdGVkRGlzcGxheU5hbWUgPSB0aGlzLl9kaXNwbGF5TmFtZTsKICAg ICAgICAgaWYgKHRoaXMuX3RydW5jYXRlZERpc3BsYXlOYW1lTGVuZ3RoICYmIHRydW5jYXRlZERp c3BsYXlOYW1lLmxlbmd0aCA+IHRoaXMuX3RydW5jYXRlZERpc3BsYXlOYW1lTGVuZ3RoKQogICAg ICAgICAgICAgdHJ1bmNhdGVkRGlzcGxheU5hbWUgPSB0cnVuY2F0ZWREaXNwbGF5TmFtZS5zdWJz dHJpbmcoMCwgdGhpcy5fdHJ1bmNhdGVkRGlzcGxheU5hbWVMZW5ndGgpICsgZWxsaXBzaXM7CiAK QEAgLTI1OCwxNSArMjM5LDE1IEBAIFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9u ZW50ID0gY2xhc3MgSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudCBleHRlbmRzCiAKICAgICAgICAg ZnVuY3Rpb24gY3JlYXRlT3B0aW9uKGNvbXBvbmVudCkKICAgICAgICAgewotICAgICAgICAgICAg dmFyIG9wdGlvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKLSAg ICAgICAgICAgIHZhciBtYXhQb3B1cE1lbnVMZW5ndGggPSAxMzA7IC8vIDxyZGFyOi8vcHJvYmxl bS8xMzQ0NTM3ND4gPHNlbGVjdD4gd2l0aCB2ZXJ5IGxvbmcgb3B0aW9uIGhhcyBjbGlwcGVkIHRl eHQgYW5kIHBvcHVwIG1lbnUgaXMgc3RpbGwgdmVyeSB3aWRlCisgICAgICAgICAgICBsZXQgb3B0 aW9uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIpOworICAgICAgICAg ICAgbGV0IG1heFBvcHVwTWVudUxlbmd0aCA9IDEzMDsgLy8gPHJkYXI6Ly9wcm9ibGVtLzEzNDQ1 Mzc0PiA8c2VsZWN0PiB3aXRoIHZlcnkgbG9uZyBvcHRpb24gaGFzIGNsaXBwZWQgdGV4dCBhbmQg cG9wdXAgbWVudSBpcyBzdGlsbCB2ZXJ5IHdpZGUKICAgICAgICAgICAgIG9wdGlvbkVsZW1lbnQu dGV4dENvbnRlbnQgPSBjb21wb25lbnQuZGlzcGxheU5hbWUubGVuZ3RoIDw9IG1heFBvcHVwTWVu dUxlbmd0aCA/IGNvbXBvbmVudC5kaXNwbGF5TmFtZSA6IGNvbXBvbmVudC5kaXNwbGF5TmFtZS5z dWJzdHJpbmcoMCwgbWF4UG9wdXBNZW51TGVuZ3RoKSArIGVsbGlwc2lzOwogICAgICAgICAgICAg b3B0aW9uRWxlbWVudC5fcGF0aENvbXBvbmVudCA9IGNvbXBvbmVudDsKICAgICAgICAgICAgIHJl dHVybiBvcHRpb25FbGVtZW50OwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIHByZXZpb3VzU2li bGluZ0NvdW50ID0gMDsKLSAgICAgICAgdmFyIHNpYmxpbmcgPSB0aGlzLnByZXZpb3VzU2libGlu ZzsKKyAgICAgICAgbGV0IHByZXZpb3VzU2libGluZ0NvdW50ID0gMDsKKyAgICAgICAgbGV0IHNp YmxpbmcgPSB0aGlzLnByZXZpb3VzU2libGluZzsKICAgICAgICAgd2hpbGUgKHNpYmxpbmcpIHsK ICAgICAgICAgICAgIHRoaXMuX3NlbGVjdEVsZW1lbnQuaW5zZXJ0QmVmb3JlKGNyZWF0ZU9wdGlv bihzaWJsaW5nKSwgdGhpcy5fc2VsZWN0RWxlbWVudC5maXJzdENoaWxkKTsKICAgICAgICAgICAg IHNpYmxpbmcgPSBzaWJsaW5nLnByZXZpb3VzU2libGluZzsKQEAgLTMyMiwxMSArMzAzLDYgQEAg V2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQgPSBjbGFzcyBIaWVyYXJjaGlj YWxQYXRoQ29tcG9uZW50IGV4dGVuZHMKICAgICB9CiB9OwogCi1XZWJJbnNwZWN0b3IuSGllcmFy Y2hpY2FsUGF0aENvbXBvbmVudC5IaWRkZW5TdHlsZUNsYXNzTmFtZSA9ICJoaWRkZW4iOwotV2Vi SW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuQ29sbGFwc2VkU3R5bGVDbGFzc05h bWUgPSAiY29sbGFwc2VkIjsKLVdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29tcG9uZW50 LlRleHRPbmx5U3R5bGVDbGFzc05hbWUgPSAidGV4dC1vbmx5IjsKLVdlYkluc3BlY3Rvci5IaWVy YXJjaGljYWxQYXRoQ29tcG9uZW50LlNob3dTZWxlY3RvckFycm93c1N0eWxlQ2xhc3NOYW1lID0g InNob3ctc2VsZWN0b3ItYXJyb3dzIjsKLQogV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhD b21wb25lbnQuTWluaW11bVdpZHRoID0gMzI7CiBXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0 aENvbXBvbmVudC5NaW5pbXVtV2lkdGhDb2xsYXBzZWQgPSAyNDsKIFdlYkluc3BlY3Rvci5IaWVy YXJjaGljYWxQYXRoQ29tcG9uZW50Lk1pbmltdW1XaWR0aEZvck9uZUNoYXJhY3RlclRydW5jYXRl ZFRpdGxlID0gNTQ7Cg==