77627 2012-02-02 04:36:59 -0800 Web Inspector: enable editing of selected rows on single click in elements panel. 2012-02-02 11:20:45 -0800 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 547786 0 pfeldman 2012-02-02 04:36:59 -0800 Single click on tag or attribute of the selected row will initiate editing. 547788 1 125114 pfeldman 2012-02-02 04:41:10 -0800 Created attachment 125114 Patch 547806 2 125119 pfeldman 2012-02-02 05:17:20 -0800 Created attachment 125119 [Patch] Same with proper drag / context menu handling. 547821 3 125119 vsevik 2012-02-02 05:38:10 -0800 Comment on attachment 125119 [Patch] Same with proper drag / context menu handling. View in context: https://bugs.webkit.org/attachment.cgi?id=125119&action=review > Source/WebCore/inspector/front-end/ElementsTreeOutline.js:998 > + this._isSingleClickCandidate; Please remove that. 547847 4 pfeldman 2012-02-02 06:28:57 -0800 Committed r106552: <http://trac.webkit.org/changeset/106552> 547971 5 joepeck 2012-02-02 10:38:23 -0800 Would this make it harder to copy/paste from the tree outline? I suppose "Right Click > Copy as HTML" will still be available. 547976 6 timothy 2012-02-02 10:46:13 -0800 To me the Elements tree would become a landmine, making it harder to select a node without having to press escape to cancel editing. 548008 7 pfeldman 2012-02-02 11:20:45 -0800 (In reply to comment #6) > To me the Elements tree would become a landmine, making it harder to select a node without having to press escape to cancel editing. It only toggles editing in case you left-click on the selected row. I've spent some time playing with it and it did not make me angry. If it does annoy you, I'm ready to roll it out. Btw, I landed an experiment that enables styles editing with single click. Also did not annoy me. Could you play with it? 125114 2012-02-02 04:41:10 -0800 2012-02-02 05:17:12 -0800 Patch bug-77627-20120202164108.patch text/plain 4009 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJkNzlmMDA2ZjRlZjI1 ZGZlY2JiZTE4NDIwMmU2MzA1Mjg1MTNhYS4uNTA2OTc3ZDE1NWNlMzJkZjQ2OThmOGM1NTAzOGE2 MDQ2ZWRmYjUyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAyLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBlbmFibGUgZWRpdGluZyBvZiBzZWxlY3RlZCByb3dzIG9uIHNpbmdsZSBjbGljayBpbiBlbGVt ZW50cyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc3NjI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2Vs ZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlw ZS5fbW91c2VEb3duKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5l LmpzOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLnNlbGVjdE9uTW91c2VEb3duKToK KyAgICAgICAgKFRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3QpOgorCiAyMDEyLTAyLTAyICBS YXVsIEh1ZGVhICA8cmh1ZGVhQGFkb2JlLmNvbT4KIAogICAgICAgICBSZWdpb25zIHNob3VsZCBp Z25vcmUgdGhlIHNhdmVkIGN1cnJlbnRSZW5kZXJGbG93VGhyZWFkIGR1cmluZyByZXBhaW50aW5n CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRz VHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzVHJlZU91dGxpbmUuanMKaW5kZXggYTg3MjE4M2Q0NDlhMGIxY2IyZWViZjIyNzQ5NDFmNmE3 MTFhOGUyMS4uMjlhMTY4YjI0ZDdmY2Q4MDBmMTE3NWE1MWViN2ZjYjE2ODM0OTg4NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNU cmVlT3V0bGluZS5qcwpAQCAtNzIxLDYgKzcyMSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Ry ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVUaXRsZSgpOwogICAg ICAgICB0aGlzLl9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRvdWJsZUNsaWNrKCk7CiAgICAgICAg IHRoaXMubGlzdEl0ZW1FbGVtZW50LmRyYWdnYWJsZSA9IHRydWU7CisgICAgICAgIHRoaXMubGlz dEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93 bi5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgX3ByZXZlbnRGb2xsb3dpbmdMaW5rc09uRG91 YmxlQ2xpY2s6IGZ1bmN0aW9uKCkKQEAgLTk0Myw2ICs5NDQsNyBAQCBXZWJJbnNwZWN0b3IuRWxl bWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tQWdlbnQuaGlnaGxpZ2h0RE9NTm9kZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlkKTsKICAg ICAgICAgdGhpcy51cGRhdGVTZWxlY3Rpb24oKTsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5z dXBwcmVzc1JldmVhbEFuZFNlbGVjdCA9IGZhbHNlOworICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9LAogCiAgICAgb25kZWxldGU6IGZ1bmN0aW9uKCkKQEAgLTk5NCw2ICs5OTYsMTMgQEAgV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAg dGhpcy5leHBhbmQoKTsKICAgICB9LAogCisgICAgX21vdXNlRG93bjogZnVuY3Rpb24oZXZlbnQp CisgICAgeworICAgICAgICBpZiAoZXZlbnQuaGFuZGxlZCB8fCB0aGlzLl9lZGl0aW5nIHx8IHRo aXMuX2VsZW1lbnRDbG9zZVRhZyB8fCAhdGhpcy5zZWxlY3RlZCkKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nVGFyZ2V0KGV2ZW50LnRhcmdldCk7CisgICAg fSwKKwogICAgIF9pbnNlcnRJbkxhc3RBdHRyaWJ1dGVQb3NpdGlvbjogZnVuY3Rpb24odGFnLCBu b2RlKQogICAgIHsKICAgICAgICAgaWYgKHRhZy5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJ3ZWJr aXQtaHRtbC1hdHRyaWJ1dGUiKS5sZW5ndGggPiAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMKaW5kZXggMzE0NGVlNGUwMTUxZjFhZDU3 YzkzZDRlY2Q0MDM4Y2JmNjY5MjUzOS4uMDE1ZmZiMzE4NGU1YmZkMDFkNTNmNjEyY2MyN2UyMWQ4 N2I4M2Q0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90 cmVlb3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3Ry ZWVvdXRsaW5lLmpzCkBAIC05OTcsMTcgKzk5NywyMiBAQCBUcmVlRWxlbWVudC5wcm90b3R5cGUu cmV2ZWFsZWQgPSBmdW5jdGlvbigpCiAKIFRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3RPbk1v dXNlRG93biA9IGZ1bmN0aW9uKGV2ZW50KQogewotICAgIHRoaXMuc2VsZWN0KGZhbHNlLCB0cnVl KTsKKyAgICBpZiAodGhpcy5zZWxlY3QoZmFsc2UsIHRydWUpKSB7CisgICAgICAgIGV2ZW50LnN0 b3BQcm9wYWdhdGlvbigpOworICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAg ICBldmVudC5oYW5kbGVkID0gdHJ1ZTsKKyAgICB9CiB9CiAKIC8qKgogICogQHBhcmFtIHtib29s ZWFuPX0gb21pdEZvY3VzCiAgKiBAcGFyYW0ge2Jvb2xlYW49fSBzZWxlY3RlZEJ5VXNlcgorICog QHJldHVybiB7Ym9vbGVhbn0KICAqLwogVHJlZUVsZW1lbnQucHJvdG90eXBlLnNlbGVjdCA9IGZ1 bmN0aW9uKG9taXRGb2N1cywgc2VsZWN0ZWRCeVVzZXIpCiB7CiAgICAgaWYgKCF0aGlzLnRyZWVP dXRsaW5lIHx8ICF0aGlzLnNlbGVjdGFibGUgfHwgdGhpcy5zZWxlY3RlZCkKLSAgICAgICAgcmV0 dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAodGhpcy50cmVlT3V0bGluZS5z ZWxlY3RlZFRyZWVFbGVtZW50KQogICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVkVHJl ZUVsZW1lbnQuZGVzZWxlY3QoKTsKQEAgLTEwMTksMTMgKzEwMjQsMTQgQEAgVHJlZUVsZW1lbnQu cHJvdG90eXBlLnNlbGVjdCA9IGZ1bmN0aW9uKG9taXRGb2N1cywgc2VsZWN0ZWRCeVVzZXIpCiAK ICAgICAvLyBGb2N1c2luZyBvbiBhbm90aGVyIG5vZGUgbWF5IGRldGFjaCAidGhpcyIgZnJvbSB0 cmVlLgogICAgIGlmICghdGhpcy50cmVlT3V0bGluZSkKLSAgICAgICAgcmV0dXJuOworICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgdGhpcy50cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50 ID0gdGhpczsKICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlKQogICAgICAgICB0aGlzLl9saXN0 SXRlbU5vZGUuY2xhc3NMaXN0LmFkZCgic2VsZWN0ZWQiKTsKIAogICAgIGlmICh0aGlzLm9uc2Vs ZWN0KQotICAgICAgICB0aGlzLm9uc2VsZWN0KHRoaXMsIHNlbGVjdGVkQnlVc2VyKTsKKyAgICAg ICAgcmV0dXJuIHRoaXMub25zZWxlY3QodGhpcywgc2VsZWN0ZWRCeVVzZXIpOworICAgIHJldHVy biBmYWxzZTsKIH0KIAogLyoqCg== 125119 2012-02-02 05:17:20 -0800 2012-02-02 05:38:10 -0800 [Patch] Same with proper drag / context menu handling. bug-77627-20120202171718.patch text/plain 4313 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJkNzlmMDA2ZjRlZjI1 ZGZlY2JiZTE4NDIwMmU2MzA1Mjg1MTNhYS4uNTA2OTc3ZDE1NWNlMzJkZjQ2OThmOGM1NTAzOGE2 MDQ2ZWRmYjUyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAyLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBlbmFibGUgZWRpdGluZyBvZiBzZWxlY3RlZCByb3dzIG9uIHNpbmdsZSBjbGljayBpbiBlbGVt ZW50cyBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc3NjI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2Vs ZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlw ZS5fbW91c2VEb3duKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5l LmpzOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLnNlbGVjdE9uTW91c2VEb3duKToK KyAgICAgICAgKFRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3QpOgorCiAyMDEyLTAyLTAyICBS YXVsIEh1ZGVhICA8cmh1ZGVhQGFkb2JlLmNvbT4KIAogICAgICAgICBSZWdpb25zIHNob3VsZCBp Z25vcmUgdGhlIHNhdmVkIGN1cnJlbnRSZW5kZXJGbG93VGhyZWFkIGR1cmluZyByZXBhaW50aW5n CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRz VHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzVHJlZU91dGxpbmUuanMKaW5kZXggYTg3MjE4M2Q0NDlhMGIxY2IyZWViZjIyNzQ5NDFmNmE3 MTFhOGUyMS4uZWQ4OTNhYjA3NjMxNTAzOGU0MjY4OTVjZTczNjc3ZmRiNzE1MWUxMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNU cmVlT3V0bGluZS5qcwpAQCAtNzIxLDYgKzcyMSw4IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Ry ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVUaXRsZSgpOwogICAg ICAgICB0aGlzLl9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRvdWJsZUNsaWNrKCk7CiAgICAgICAg IHRoaXMubGlzdEl0ZW1FbGVtZW50LmRyYWdnYWJsZSA9IHRydWU7CisgICAgICAgIHRoaXMubGlz dEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGljay5i aW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigibW91c2Vkb3duIiwgdGhpcy5fbW91c2VEb3duLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAg ICBfcHJldmVudEZvbGxvd2luZ0xpbmtzT25Eb3VibGVDbGljazogZnVuY3Rpb24oKQpAQCAtOTQz LDYgKzk0NSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC5oaWdobGlnaHRET01Ob2RlKHRo aXMucmVwcmVzZW50ZWRPYmplY3QuaWQpOwogICAgICAgICB0aGlzLnVwZGF0ZVNlbGVjdGlvbigp OwogICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnN1cHByZXNzUmV2ZWFsQW5kU2VsZWN0ID0gZmFs c2U7CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKICAgICBvbmRlbGV0ZTogZnVuY3Rp b24oKQpAQCAtOTkyLDYgKzk5NSwyMSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKHRoaXMuaGFzQ2hpbGRyZW4gJiYgIXRoaXMu ZXhwYW5kZWQpCiAgICAgICAgICAgICB0aGlzLmV4cGFuZCgpOworICAgICAgICB0aGlzLl9pc1Np bmdsZUNsaWNrQ2FuZGlkYXRlOworICAgIH0sCisKKyAgICBfbW91c2VDbGljazogZnVuY3Rpb24o ZXZlbnQpCisgICAgeworICAgICAgICBpZiAodGhpcy5faXNTaW5nbGVDbGlja0NhbmRpZGF0ZSkK KyAgICAgICAgICAgIHRoaXMuX3N0YXJ0RWRpdGluZ1RhcmdldChldmVudC50YXJnZXQpOworICAg ICAgICB0aGlzLl9pc1NpbmdsZUNsaWNrQ2FuZGlkYXRlID0gZmFsc2U7CisgICAgfSwKKworICAg IF9tb3VzZURvd246IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKGV2ZW50Lmhh bmRsZWQgfHwgZXZlbnQud2hpY2ggIT09IDEgfHwgdGhpcy5fZWRpdGluZyB8fCB0aGlzLl9lbGVt ZW50Q2xvc2VUYWcgfHwgIXRoaXMuc2VsZWN0ZWQpCisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIHRoaXMuX2lzU2luZ2xlQ2xpY2tDYW5kaWRhdGUgPSB0cnVlOwogICAgIH0sCiAKICAgICBf aW5zZXJ0SW5MYXN0QXR0cmlidXRlUG9zaXRpb246IGZ1bmN0aW9uKHRhZywgbm9kZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCmluZGV4 IDMxNDRlZTRlMDE1MWYxYWQ1N2M5M2Q0ZWNkNDAzOGNiZjY2OTI1MzkuLjAxNWZmYjMxODRlNWJm ZDAxZDUzZjYxMmNjMjdlMjFkODdiODNkNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcwpAQCAtOTk3LDE3ICs5OTcsMjIgQEAgVHJl ZUVsZW1lbnQucHJvdG90eXBlLnJldmVhbGVkID0gZnVuY3Rpb24oKQogCiBUcmVlRWxlbWVudC5w cm90b3R5cGUuc2VsZWN0T25Nb3VzZURvd24gPSBmdW5jdGlvbihldmVudCkKIHsKLSAgICB0aGlz LnNlbGVjdChmYWxzZSwgdHJ1ZSk7CisgICAgaWYgKHRoaXMuc2VsZWN0KGZhbHNlLCB0cnVlKSkg eworICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKyAgICAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKKyAgICAgICAgZXZlbnQuaGFuZGxlZCA9IHRydWU7CisgICAgfQogfQogCiAv KioKICAqIEBwYXJhbSB7Ym9vbGVhbj19IG9taXRGb2N1cwogICogQHBhcmFtIHtib29sZWFuPX0g c2VsZWN0ZWRCeVVzZXIKKyAqIEByZXR1cm4ge2Jvb2xlYW59CiAgKi8KIFRyZWVFbGVtZW50LnBy b3RvdHlwZS5zZWxlY3QgPSBmdW5jdGlvbihvbWl0Rm9jdXMsIHNlbGVjdGVkQnlVc2VyKQogewog ICAgIGlmICghdGhpcy50cmVlT3V0bGluZSB8fCAhdGhpcy5zZWxlY3RhYmxlIHx8IHRoaXMuc2Vs ZWN0ZWQpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYg KHRoaXMudHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKICAgICAgICAgdGhpcy50cmVl T3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRlc2VsZWN0KCk7CkBAIC0xMDE5LDEzICsxMDI0 LDE0IEBAIFRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3QgPSBmdW5jdGlvbihvbWl0Rm9jdXMs IHNlbGVjdGVkQnlVc2VyKQogCiAgICAgLy8gRm9jdXNpbmcgb24gYW5vdGhlciBub2RlIG1heSBk ZXRhY2ggInRoaXMiIGZyb20gdHJlZS4KICAgICBpZiAoIXRoaXMudHJlZU91dGxpbmUpCi0gICAg ICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHRoaXMudHJlZU91dGxpbmUu c2VsZWN0ZWRUcmVlRWxlbWVudCA9IHRoaXM7CiAgICAgaWYgKHRoaXMuX2xpc3RJdGVtTm9kZSkK ICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNzTGlzdC5hZGQoInNlbGVjdGVkIik7CiAK ICAgICBpZiAodGhpcy5vbnNlbGVjdCkKLSAgICAgICAgdGhpcy5vbnNlbGVjdCh0aGlzLCBzZWxl Y3RlZEJ5VXNlcik7CisgICAgICAgIHJldHVybiB0aGlzLm9uc2VsZWN0KHRoaXMsIHNlbGVjdGVk QnlVc2VyKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIC8qKgo=