203308 2019-10-23 12:03:17 -0700 Web Inspector: Styles: un-experimentalize showing rule icons 2019-10-25 18:58:59 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1582932 0 hi 2019-10-23 12:03:17 -0700 I've been living on this for a while, and there have been no issues. 1582941 1 mattbaker 2019-10-23 12:19:26 -0700 FWIW, I really dislike the rule icons. Part of the sidebar cleanup Nikita did recently was to simplify a lot of the visual clutter that has plagued this sidebar. The icons add a clickable context-menu target, which is nice, but it would be great if there was another way to get that functionality without adding back these hideous icons. 1582962 2 381713 hi 2019-10-23 12:56:40 -0700 Created attachment 381713 Patch 1583970 3 joepeck 2019-10-25 12:51:56 -0700 (In reply to Matt Baker from comment #1) > FWIW, I really dislike the rule icons. Part of the sidebar cleanup Nikita > did recently was to simplify a lot of the visual clutter that has plagued > this sidebar. The visual clutter that I recall was inside the properties itself (warning icons, strikethroughs, etc). > The icons add a clickable context-menu target, which is nice, but it would > be great if there was another way to get that functionality without adding > back these hideous icons. FWIW, the icons were discussed over here, and I think my comment still stands: https://bugs.webkit.org/show_bug.cgi?id=199946#c16 > I think adding icons provides the following benefits with no obvious drawbacks: > > (1) Distinguishing CSS "Rule" Types and providing visual anchors for rule sections > Types: > • Style Attribute > • Author Rule > • Inherited Rule > • User Agent Rule > • Pseudo Element Rule > > (2) Provides a convenient Hit Target for Discovery and Activation of Useful Actions associated with the "Rule" > Actions: > • Copy (selector + properties) > • Enable/Disable > • Duplicate (starting point to create a new rule like this one much easier then typing it all out from scratch) > > None of these have corollaries in the current sidebar. > > • Finding a pseudo element selector in the current design means reading the bold and only bold text of each selector in a list which may be difficult in a list of complex selectors. > • Finding the next selector in a list of complex selectors is not easy as it could be, you have to find the thin gray line and the typically obfuscated link > • Copying an entire CSS Rule (selector + properties) is not possible today without a seemingly broken selection rect > • Enabling / Disabling all properties in a rule takes many clicks or deleting the properties > • Duplicating a Rule is not possible today today without copying and pasting a few times or re-typing the full selector > > So I see a lot of benefits to this without any drawbacks. Can you enumerate why you think the icons are "hideous"? It sounds like you agree with (2) but don't disagree in the value of (1). Is that the case, or do you still see (1) as valuable and just dislike the UI we are using? 1584031 4 mattbaker 2019-10-25 15:10:52 -0700 (In reply to Joseph Pecoraro from comment #3) > (In reply to Matt Baker from comment #1) > > FWIW, I really dislike the rule icons. Part of the sidebar cleanup Nikita > > did recently was to simplify a lot of the visual clutter that has plagued > > this sidebar. > > The visual clutter that I recall was inside the properties itself (warning > icons, strikethroughs, etc). > > > The icons add a clickable context-menu target, which is nice, but it would > > be great if there was another way to get that functionality without adding > > back these hideous icons. > > FWIW, the icons were discussed over here, and I think my comment still > stands: > https://bugs.webkit.org/show_bug.cgi?id=199946#c16 > > > I think adding icons provides the following benefits with no obvious drawbacks: > > > > (1) Distinguishing CSS "Rule" Types and providing visual anchors for rule sections > > Types: > > • Style Attribute > > • Author Rule > > • Inherited Rule > > • User Agent Rule > > • Pseudo Element Rule > > > > (2) Provides a convenient Hit Target for Discovery and Activation of Useful Actions associated with the "Rule" > > Actions: > > • Copy (selector + properties) > > • Enable/Disable > > • Duplicate (starting point to create a new rule like this one much easier then typing it all out from scratch) > > > > None of these have corollaries in the current sidebar. > > > > • Finding a pseudo element selector in the current design means reading the bold and only bold text of each selector in a list which may be difficult in a list of complex selectors. > > • Finding the next selector in a list of complex selectors is not easy as it could be, you have to find the thin gray line and the typically obfuscated link > > • Copying an entire CSS Rule (selector + properties) is not possible today without a seemingly broken selection rect > > • Enabling / Disabling all properties in a rule takes many clicks or deleting the properties > > • Duplicating a Rule is not possible today today without copying and pasting a few times or re-typing the full selector > > > > So I see a lot of benefits to this without any drawbacks. > > > Can you enumerate why you think the icons are "hideous"? That was a bit dramatic. My only problem with the icons is just that, IMO, they visually clutter the UI. > It sounds like you agree with (2) but don't disagree in the value of (1). Is > that the case, or do you still see (1) as valuable and just dislike the UI > we are using? This is a fair assessment. I don't find the following helpful/necessary (again, just my opinion/personal taste): - Distinguishing the rule type - Visually anchoring the rule - Helping to find the next selector I do agree that having a UI for doing things like duplicating and copying rules is very useful. I suppose there really isn't another place to locate such a UI, and I definitely don't have any good suggestions, so this seems fine. 1584058 5 381713 joepeck 2019-10-25 16:01:06 -0700 Comment on attachment 381713 Patch rs=me 1584141 6 381713 commit-queue 2019-10-25 18:57:51 -0700 Comment on attachment 381713 Patch Clearing flags on attachment: 381713 Committed r251624: <https://trac.webkit.org/changeset/251624> 1584142 7 commit-queue 2019-10-25 18:57:52 -0700 All reviewed patches have been landed. Closing bug. 1584143 8 webkit-bug-importer 2019-10-25 18:58:59 -0700 <rdar://problem/56639816> 381713 2019-10-23 12:56:40 -0700 2019-10-25 18:57:51 -0700 Patch 203308.diff text/plain 8893 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhkOTJkN2VjNDViLi5hNzEzM2Y4ZmI0NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMTAtMjMgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0 eWxlczogdW4tZXhwZXJpbWVudGFsaXplIHNob3dpbmcgcnVsZSBpY29ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMzA4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1Nl dHRpbmcuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu X2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdzVmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAg ICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUuaW5p dGlhbExheW91dCk6CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uLnByb3RvdHlwZS5fcmVuZGVyU2VsZWN0b3IpOgorCiAyMDE5LTEwLTIyICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTb3Vy Y2VzOiBrZWVwIHRoZSBmdW5jdGlvbi9vYmplY3QgbmFtZSBzdGlja3kgaW4gdGhlIG9iamVjdCBw cmV2aWV3IHBvcG92ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDU3MjU2 YjU0Y2ExLi43OGMzY2QwYzMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC0xMDE4LDcgKzEwMTgsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IEFsbCBOb2RlcyAoJWQg TW9yZSkiXSA9ICJTaG93IEFsbCBOb2RlcyAoJWQgTW9yZSkiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyBDb25zb2xlIl0gPSAiU2hvdyBDb25zb2xlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cg Q29uc29sZSB0YWIiXSA9ICJTaG93IENvbnNvbGUgdGFiIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgRWxlbWVudHMiXSA9ICJTaG93IEVsZW1lbnRzIjsKLWxvY2FsaXplZFN0cmluZ3NbIlNob3cg SWNvbnMiXSA9ICJTaG93IEljb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgSnVtcCB0byBF ZmZlY3RpdmUgUHJvcGVydHkgQnV0dG9uIl0gPSAiU2hvdyBKdW1wIHRvIEVmZmVjdGl2ZSBQcm9w ZXJ0eSBCdXR0b24iOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBQYXRoIl0gPSAiU2hvdyBQYXRo IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgUmVtYWluaW5nICglZCkiXSA9ICJTaG93IFJlbWFp bmluZyAoJWQpIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcwppbmRleCA3ODMxYTZiYWNiMC4uMzU4YTA3OWU3MzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMK QEAgLTE4OSw3ICsxODksNiBAQCBXSS5zZXR0aW5ncyA9IHsKICAgICBleHBlcmltZW50YWxFbmFi bGVQcmV2aWV3RmVhdHVyZXM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLXBy ZXZpZXctZmVhdHVyZXMiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFi OiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1sYXllcnMtdGFiIiwgZmFsc2Up LAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZU5ld1RhYkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVy aW1lbnRhbC1lbmFibGUtbmV3LXRhYi1iYXIiLCBmYWxzZSksCi0gICAgZXhwZXJpbWVudGFsRW5h YmxlU3R5bGVzSWNvbnM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtc3R5bGVzLWljb25z IiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb0VmZmVjdGl2ZTog bmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1zdHlsZXMtanVtcC10by1lZmZlY3RpdmUiLCBm YWxzZSksCiAKICAgICAvLyBQcm90b2NvbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZp ZXcuanMKaW5kZXggMWE1ODJmY2Q3MDcuLmNmODQ0NDY2NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTM2NCw3ICszNjQsNiBAQCBXSS5TZXR0aW5nc1RhYkNv bnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNv bnRlbnRWaQogCiAgICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0RvbWFpbigiQ1NTIikp IHsKICAgICAgICAgICAgIGxldCBzdHlsZXNHcm91cCA9IGV4cGVyaW1lbnRhbFNldHRpbmdzVmll dy5hZGRHcm91cChXSS5VSVN0cmluZygiU3R5bGVzOiIpKTsKLSAgICAgICAgICAgIHN0eWxlc0dy b3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSWNvbnMs IFdJLlVJU3RyaW5nKCJTaG93IEljb25zIikpOwogICAgICAgICAgICAgc3R5bGVzR3JvdXAuYWRk U2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9FZmZlY3Rp dmUsIFdJLlVJU3RyaW5nKCJTaG93IEp1bXAgdG8gRWZmZWN0aXZlIFByb3BlcnR5IEJ1dHRvbiIp KTsKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsK ICAgICAgICAgfQpAQCAtMzkzLDEwICszOTIsOCBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQog ICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5 ZXJzVGFiKTsKICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRh bEVuYWJsZU5ld1RhYkJhcik7CiAKLSAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzRG9t YWluKCJDU1MiKSkgewotICAgICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4 cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0ljb25zKTsKKyAgICAgICAgaWYgKEluc3BlY3RvckJhY2tl bmQuaGFzRG9tYWluKCJDU1MiKSkKICAgICAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0 aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9FZmZlY3RpdmUpOwotICAgICAgICB9 CiAKICAgICAgICAgdGhpcy5hZGRTZXR0aW5nc1ZpZXcoZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3 KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbi5qcwppbmRleCBkODg5ZjRiODZiYS4uNTliNzRlY2U2NjkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2Vj dGlvbi5qcwpAQCAtNjIsNDIgKzYyLDQwIEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TCiAgICAg ewogICAgICAgICBzdXBlci5pbml0aWFsTGF5b3V0KCk7CiAKLSAgICAgICAgaWYgKFdJLnNldHRp bmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0ljb25zLnZhbHVlKSB7Ci0gICAgICAgICAgICBs ZXQgaWNvbkNsYXNzTmFtZSA9IG51bGw7Ci0gICAgICAgICAgICBzd2l0Y2ggKHRoaXMuX3N0eWxl LnR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLlJ1 bGU6Ci0gICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fc3R5bGUub3duZXJSdWxl KTsKLSAgICAgICAgICAgICAgICBpZiAodGhpcy5fc3R5bGUuaW5oZXJpdGVkKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSAiaW5oZXJpdGVkLXN0eWxlLXJ1bGUtaWNvbiI7 Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLQotICAgICAg ICAgICAgICAgIHN3aXRjaCAodGhpcy5fc3R5bGUub3duZXJSdWxlLnR5cGUpIHsKLSAgICAgICAg ICAgICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5BdXRob3I6Ci0gICAgICAgICAgICAg ICAgICAgIGljb25DbGFzc05hbWUgPSAiYXV0aG9yLXN0eWxlLXJ1bGUtaWNvbiI7Ci0gICAgICAg ICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgV0kuQ1NTU3R5bGVTaGVl dC5UeXBlLlVzZXI6Ci0gICAgICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSAidXNlci1z dHlsZS1ydWxlLWljb24iOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg ICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyQWdlbnQ6Ci0gICAgICAgICAgICAg ICAgICAgIGljb25DbGFzc05hbWUgPSAidXNlci1hZ2VudC1zdHlsZS1ydWxlLWljb24iOwotICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICBjYXNlIFdJLkNTU1N0eWxl U2hlZXQuVHlwZS5JbnNwZWN0b3I6Ci0gICAgICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUg PSAiaW5zcGVjdG9yLXN0eWxlLXJ1bGUtaWNvbiI7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg IGNhc2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLklubGluZToKLSAgICAgICAgICAgIGNh c2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLkF0dHJpYnV0ZToKLSAgICAgICAgICAgICAg ICBpZiAodGhpcy5fc3R5bGUuaW5oZXJpdGVkKQotICAgICAgICAgICAgICAgICAgICBpY29uQ2xh c3NOYW1lID0gImluaGVyaXRlZC1lbGVtZW50LXN0eWxlLXJ1bGUtaWNvbiI7Ci0gICAgICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBpY29uQ2xhc3NOYW1lID0gV0kuRE9NVHJl ZUVsZW1lbnRQYXRoQ29tcG9uZW50LkRPTUVsZW1lbnRJY29uU3R5bGVDbGFzc05hbWU7CisgICAg ICAgIGxldCBpY29uQ2xhc3NOYW1lID0gbnVsbDsKKyAgICAgICAgc3dpdGNoICh0aGlzLl9zdHls ZS50eXBlKSB7CisgICAgICAgIGNhc2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLlJ1bGU6 CisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9zdHlsZS5vd25lclJ1bGUpOworICAg ICAgICAgICAgaWYgKHRoaXMuX3N0eWxlLmluaGVyaXRlZCkgeworICAgICAgICAgICAgICAgIGlj b25DbGFzc05hbWUgPSAiaW5oZXJpdGVkLXN0eWxlLXJ1bGUtaWNvbiI7CiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydChpY29u Q2xhc3NOYW1lKTsKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGFz LWljb24iLCBpY29uQ2xhc3NOYW1lKTsKKworICAgICAgICAgICAgc3dpdGNoICh0aGlzLl9zdHls ZS5vd25lclJ1bGUudHlwZSkgeworICAgICAgICAgICAgY2FzZSBXSS5DU1NTdHlsZVNoZWV0LlR5 cGUuQXV0aG9yOgorICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSAiYXV0aG9yLXN0eWxl LXJ1bGUtaWNvbiI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdJ LkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyOgorICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUg PSAidXNlci1zdHlsZS1ydWxlLWljb24iOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgY2FzZSBXSS5DU1NTdHlsZVNoZWV0LlR5cGUuVXNlckFnZW50OgorICAgICAgICAgICAg ICAgIGljb25DbGFzc05hbWUgPSAidXNlci1hZ2VudC1zdHlsZS1ydWxlLWljb24iOworICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXSS5DU1NTdHlsZVNoZWV0LlR5cGUu SW5zcGVjdG9yOgorICAgICAgICAgICAgICAgIGljb25DbGFzc05hbWUgPSAiaW5zcGVjdG9yLXN0 eWxlLXJ1bGUtaWNvbiI7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXSS5DU1NTdHlsZURlY2xhcmF0aW9uLlR5 cGUuSW5saW5lOgorICAgICAgICBjYXNlIFdJLkNTU1N0eWxlRGVjbGFyYXRpb24uVHlwZS5BdHRy aWJ1dGU6CisgICAgICAgICAgICBpZiAodGhpcy5fc3R5bGUuaW5oZXJpdGVkKQorICAgICAgICAg ICAgICAgIGljb25DbGFzc05hbWUgPSAiaW5oZXJpdGVkLWVsZW1lbnQtc3R5bGUtcnVsZS1pY29u IjsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBpY29uQ2xhc3NOYW1lID0gV0ku RE9NVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50LkRPTUVsZW1lbnRJY29uU3R5bGVDbGFzc05hbWU7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorICAgICAgICBjb25zb2xlLmFzc2VydChp Y29uQ2xhc3NOYW1lKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJoYXMt aWNvbiIsIGljb25DbGFzc05hbWUpOwogCiAgICAgICAgIGxldCBncm91cGluZ3MgPSB0aGlzLl9z dHlsZS5ncm91cGluZ3MuZmlsdGVyKChncm91cGluZykgPT4gZ3JvdXBpbmcudGV4dCAhPT0gImFs bCIpOwogICAgICAgICBpZiAoZ3JvdXBpbmdzLmxlbmd0aCkgewpAQCAtMzUyLDE0ICszNTAsMTIg QEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGNsYXNzIFNwcmVh ZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMKICAgICAgICAgICAgIHNlbGVjdG9yRWxlbWVudC5j bGFzc0xpc3QuYWRkKFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uTWF0 Y2hlZFNlbGVjdG9yRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgfTsKIAotICAgICAg ICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSWNvbnMudmFsdWUpIHsK LSAgICAgICAgICAgIGlmICghdGhpcy5faWNvbkVsZW1lbnQpIHsKLSAgICAgICAgICAgICAgICB0 aGlzLl9pY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwotICAgICAg ICAgICAgICAgIHRoaXMuX2ljb25FbGVtZW50LmNsYXNzTGlzdC5hZGQoImljb24iKTsKLSAgICAg ICAgICAgICAgICBXSS5hZGRNb3VzZURvd25Db250ZXh0TWVudUhhbmRsZXJzKHRoaXMuX2ljb25F bGVtZW50LCB0aGlzLl9wb3B1bGF0ZUljb25FbGVtZW50Q29udGV4dE1lbnUuYmluZCh0aGlzKSk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5faWNvbkVsZW1lbnQpOworICAgICAgICBpZiAoIXRoaXMuX2ljb25FbGVtZW50 KSB7CisgICAgICAgICAgICB0aGlzLl9pY29uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImltZyIpOworICAgICAgICAgICAgdGhpcy5faWNvbkVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi aWNvbiIpOworICAgICAgICAgICAgV0kuYWRkTW91c2VEb3duQ29udGV4dE1lbnVIYW5kbGVycyh0 aGlzLl9pY29uRWxlbWVudCwgdGhpcy5fcG9wdWxhdGVJY29uRWxlbWVudENvbnRleHRNZW51LmJp bmQodGhpcykpOwogICAgICAgICB9CisgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9pY29uRWxlbWVudCk7CiAKICAgICAgICAgc3dpdGNoICh0aGlzLl9zdHls ZS50eXBlKSB7CiAgICAgICAgIGNhc2UgV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5UeXBlLlJ1bGU6 Cg==