216136 2020-09-03 12:07:05 -0700 Web Inspector: Localization: "Low/Medium/High" strings need separate keys for different uses in the UI 2020-09-04 11:23:06 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1685385 0 nvasilyev 2020-09-03 12:07:05 -0700 <rdar://67800281> 1685393 1 407906 nvasilyev 2020-09-03 12:20:53 -0700 Created attachment 407906 Patch 1685399 2 407906 hi 2020-09-03 12:48:30 -0700 Comment on attachment 407906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407906&action=review > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:685 > +localizedStrings["High @ Energy Impact"] = "High"; Can we have a more descriptive keys/comments that includes where in the UI these are found and more of a description of what it's supposed to mean? e.g. ``` WI.UIString("Low", "Low @ CPU Timeline Energy Impact", "Label indicating that the CPU activity was low during the selected range of the selected timeline recording."); ``` > Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js:1114 > + if (average === 0) > + this._energyChart.value = 0; > + else > + this._energyChart.value = mapWithBias(average, 0, CPUTimelineView.lowEnergyThreshold, 0, CPUTimelineView.lowEnergyGraphBoundary, 0.85); NIT: i think we can just drop the `if (average === 0)` branch, as `mapWithBias` should return `0` if `average` is `0` 1685407 3 407906 nvasilyev 2020-09-03 13:08:04 -0700 Comment on attachment 407906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407906&action=review >> Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:685 >> +localizedStrings["High @ Energy Impact"] = "High"; > > Can we have a more descriptive keys/comments that includes where in the UI these are found and more of a description of what it's supposed to mean? > > e.g. > ``` > WI.UIString("Low", "Low @ CPU Timeline Energy Impact", "Label indicating that the CPU activity was low during the selected range of the selected timeline recording."); > ``` The goal of this patch is to provide the exact noun the adjective is used with. I'll provide an example for Russian, which has a concept of grammatical gender (https://en.wikipedia.org/wiki/Grammatical_gender): Impact - влияние (оно, neutral grammatical gender) high impact - высокое влияние priority - приоритет (он, masculine grammatical gender) high priority - высокий приоритет The important part here is that "high" is translated differently, "высокОЕ" vs "высокИЙ". --- The description you provided looks like a documentation. I wouldn't know what grammatical gender to use from it. "Energy Impact: High" is slightly excessive already. All required is a noun — "Impact". 1685483 4 407906 bburg 2020-09-03 16:21:31 -0700 Comment on attachment 407906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407906&action=review >>> Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:685 >>> +localizedStrings["High @ Energy Impact"] = "High"; >> >> Can we have a more descriptive keys/comments that includes where in the UI these are found and more of a description of what it's supposed to mean? >> >> e.g. >> ``` >> WI.UIString("Low", "Low @ CPU Timeline Energy Impact", "Label indicating that the CPU activity was low during the selected range of the selected timeline recording."); >> ``` > > The goal of this patch is to provide the exact noun the adjective is used with. > > I'll provide an example for Russian, which has a concept of grammatical gender (https://en.wikipedia.org/wiki/Grammatical_gender): > > Impact - влияние (оно, neutral grammatical gender) > high impact - высокое влияние > > priority - приоритет (он, masculine grammatical gender) > high priority - высокий приоритет > > The important part here is that "high" is translated differently, "высокОЕ" vs "высокИЙ". > > --- > > The description you provided looks like a documentation. I wouldn't know what grammatical gender to use from it. > > "Energy Impact: High" is slightly excessive already. All required is a noun — "Impact". While I understand Nikita's point, the reason for the key to exist is for localizers to be able to find the string in the user interface. A comment would be more appropriate to describe the nouns it should be used with. For example, the comment here could be "Label for timeline samples that have High energy impact." This matches the approach used for other localizable apps / localizable.strings files. 1685484 5 407906 bburg 2020-09-03 16:22:56 -0700 Comment on attachment 407906 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407906&action=review >>>> Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:685 >>>> +localizedStrings["High @ Energy Impact"] = "High"; >>> >>> Can we have a more descriptive keys/comments that includes where in the UI these are found and more of a description of what it's supposed to mean? >>> >>> e.g. >>> ``` >>> WI.UIString("Low", "Low @ CPU Timeline Energy Impact", "Label indicating that the CPU activity was low during the selected range of the selected timeline recording."); >>> ``` >> >> The goal of this patch is to provide the exact noun the adjective is used with. >> >> I'll provide an example for Russian, which has a concept of grammatical gender (https://en.wikipedia.org/wiki/Grammatical_gender): >> >> Impact - влияние (оно, neutral grammatical gender) >> high impact - высокое влияние >> >> priority - приоритет (он, masculine grammatical gender) >> high priority - высокий приоритет >> >> The important part here is that "high" is translated differently, "высокОЕ" vs "высокИЙ". >> >> --- >> >> The description you provided looks like a documentation. I wouldn't know what grammatical gender to use from it. >> >> "Energy Impact: High" is slightly excessive already. All required is a noun — "Impact". > > While I understand Nikita's point, the reason for the key to exist is for localizers to be able to find the string in the user interface. A comment would be more appropriate to describe the nouns it should be used with. For example, the comment here could be "Label for timeline samples that have High energy impact." This matches the approach used for other localizable apps / localizable.strings files. So... I think your comments and string values are good, just the key should be more like Devin suggested. Thanks for fixing this! 1685487 6 nvasilyev 2020-09-03 16:40:58 -0700 (In reply to Brian Burg from comment #4) > While I understand Nikita's point, the reason for the key to exist is for > localizers to be able to find the string in the user interface. I didn't consider that. What about the one I named "High @ Network Priority"? It's used in several places: Sources details sidebar, Network tab, and Timelines tab - Network Requests. I was using keys just specific enough to distinguish the same UIStrings from each other. 1685566 7 407945 nvasilyev 2020-09-03 23:40:46 -0700 Created attachment 407945 Patch 1685767 8 407945 bburg 2020-09-04 11:14:47 -0700 Comment on attachment 407945 Patch r=me 1685774 9 ews-feeder 2020-09-04 11:23:05 -0700 Committed r266622: <https://trac.webkit.org/changeset/266622> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407945. 407906 2020-09-03 12:20:53 -0700 2020-09-03 23:40:46 -0700 Patch patch.txt text/plain 8042 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY3ZDM3YmUxOTY3Mi4uMzdhZGI1ZDA3MmVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wOS0wMyAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBMb2NhbGl6YXRpb246ICJMb3cvTWVkaXVtL0hpZ2giIHN0cmluZ3MgbmVlZCBzZXBhcmF0 ZSBrZXlzIGZvciBkaWZmZXJlbnQgdXNlcyBpbiB0aGUgVUkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjEzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgZW5vdWdoIGNvbnRleHQgdG8gdW5k ZXJzdGFuZCB3aGF0IG5vdW5zICJsb3cvbWVkaXVtL2hpZ2giIGFyZSB1c2VkIHdpdGgKKyAgICAg ICAgKCJpbXBhY3QiIGFuZCAicHJpb3JpdHkiLCBpbiBvdXIgY2FzZSkuIFRoaXMgaXMgbmVjZXNz YXJ5IHRvIGRldGVybWluZSBhZGplY3RpdmVzJworICAgICAgICBncmFtbWF0aWNhbCBnZW5kZXIu CisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanM6CisgICAgICAgIChX SS5SZXNvdXJjZS5kaXNwbGF5TmFtZUZvclByaW9yaXR5KToKKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV0kuQ1BVVGltZWxpbmVW aWV3LnByb3RvdHlwZS5fbGF5b3V0RW5lcmd5Q2hhcnQpOgorICAgICAgICBEcml2ZS1ieTogbWVy Z2UgdHdvIGlmIGJsb2NrcyBpbnRvIG9uZSB0byBtaW5pbWl6ZSBjb2RlIHJlcGV0aXRpb24uCisK IDIwMjAtMDktMDMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFsbG93IHNwZWNpYWwgSmF2YVNjcmlwdCBicmVha3BvaW50cyB0byBi ZSBjb25maWd1cmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA2ZmNmMzU3 YjExNWIuLjkzMDFlOWYwNzVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC02ODEsNyArNjgxLDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgdGhlIG5hdmlnYXRpb24g c2lkZWJhciAoJXMpIl0gPSAiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlCiBsb2NhbGl6ZWRTdHJp bmdzWyJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIl0gPSAiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHR5cGUgaW5mb3JtYXRpb24iXSA9ICJIaWRlIHR5cGUg aW5mb3JtYXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siSGllcmFyY2h5IExldmVsIl0gPSAiSGll cmFyY2h5IExldmVsIjsKLWxvY2FsaXplZFN0cmluZ3NbIkhpZ2giXSA9ICJIaWdoIjsKKy8qIEVu ZXJneSBJbXBhY3Q6IEhpZ2ggKi8KK2xvY2FsaXplZFN0cmluZ3NbIkhpZ2ggQCBFbmVyZ3kgSW1w YWN0Il0gPSAiSGlnaCI7CisvKiBIaWdoIG5ldHdvcmsgcmVxdWVzdCBwcmlvcml0eSAqLworbG9j YWxpemVkU3RyaW5nc1siSGlnaCBAIE5ldHdvcmsgUHJpb3JpdHkiXSA9ICJIaWdoIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkhpZ2hlc3Q6ICVzIl0gPSAiSGlnaGVzdDogJXMiOwogbG9jYWxpemVkU3Ry aW5nc1siSG9zdCJdID0gIkhvc3QiOwogbG9jYWxpemVkU3RyaW5nc1siSUNPIl0gPSAiSUNPIjsK QEAgLTc5Miw3ICs3OTUsMTAgQEAgbG9jYWxpemVkU3RyaW5nc1siTG9nIFZhbHVlIl0gPSAiTG9n IFZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZyBXZWJTb2NrZXQiXSA9ICJMb2cgV2ViU29j a2V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZzogIl0gPSAiTG9nOiAiOwogbG9jYWxpemVkU3Ry aW5nc1siTG9ncyJdID0gIkxvZ3MiOwotbG9jYWxpemVkU3RyaW5nc1siTG93Il0gPSAiTG93IjsK Ky8qIEVuZXJneSBJbXBhY3Q6IExvdyAqLworbG9jYWxpemVkU3RyaW5nc1siTG93IEAgRW5lcmd5 IEltcGFjdCJdID0gIkxvdyI7CisvKiBMb3cgbmV0d29yayByZXF1ZXN0IHByaW9yaXR5ICovCits b2NhbGl6ZWRTdHJpbmdzWyJMb3cgQCBOZXR3b3JrIFByaW9yaXR5Il0gPSAiTG93IjsKIGxvY2Fs aXplZFN0cmluZ3NbIkxvd2VzdDogJXMiXSA9ICJMb3dlc3Q6ICVzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIk1JTUUgVHlwZSJdID0gIk1JTUUgVHlwZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNSU1FIFR5 cGU6Il0gPSAiTUlNRSBUeXBlOiI7CkBAIC04MTMsNyArODE5LDEwIEBAIGxvY2FsaXplZFN0cmlu Z3NbIk1lZGlhIEVsZW1lbnQiXSA9ICJNZWRpYSBFbGVtZW50IjsKIGxvY2FsaXplZFN0cmluZ3Nb Ik1lZGlhIEV2ZW50Il0gPSAiTWVkaWEgRXZlbnQiOwogbG9jYWxpemVkU3RyaW5nc1siTWVkaWEg TG9nZ2luZzoiXSA9ICJNZWRpYSBMb2dnaW5nOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNZWRpYVNv dXJjZSJdID0gIk1lZGlhU291cmNlIjsKLWxvY2FsaXplZFN0cmluZ3NbIk1lZGl1bSJdID0gIk1l ZGl1bSI7CisvKiBFbmVyZ3kgSW1wYWN0OiBNZWRpdW0gKi8KK2xvY2FsaXplZFN0cmluZ3NbIk1l ZGl1bSBAIEVuZXJneSBJbXBhY3QiXSA9ICJNZWRpdW0iOworLyogTWVkaXVtIG5ldHdvcmsgcmVx dWVzdCBwcmlvcml0eSAqLworbG9jYWxpemVkU3RyaW5nc1siTWVkaXVtIEAgTmV0d29yayBQcmlv cml0eSJdID0gIk1lZGl1bSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNZW1vcnkiXSA9ICJNZW1vcnki OwogbG9jYWxpemVkU3RyaW5nc1siTWVtb3J5IENhY2hlIl0gPSAiTWVtb3J5IENhY2hlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIk1lbW9yeSB1c2FnZSBvZiB0aGlzIGNhbnZhcyJdID0gIk1lbW9yeSB1 c2FnZSBvZiB0aGlzIGNhbnZhcyI7CkBAIC0xNDE0LDcgKzE0MjMsOCBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJWZXJzaW9uIl0gPSAiVmVyc2lvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWZXJ0ZXgiXSA9 ICJWZXJ0ZXgiOwogbG9jYWxpemVkU3RyaW5nc1siVmVydGV4IFNoYWRlciJdID0gIlZlcnRleCBT aGFkZXIiOwogbG9jYWxpemVkU3RyaW5nc1siVmVydGV4L0ZyYWdtZW50IFNoYWRlciJdID0gIlZl cnRleC9GcmFnbWVudCBTaGFkZXIiOwotbG9jYWxpemVkU3RyaW5nc1siVmVyeSBIaWdoIl0gPSAi VmVyeSBIaWdoIjsKKy8qIEVuZXJneSBJbXBhY3Q6IFZlcnkgSGlnaCAqLworbG9jYWxpemVkU3Ry aW5nc1siVmVyeSBIaWdoIEAgRW5lcmd5IEltcGFjdCJdID0gIlZlcnkgSGlnaCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJWaWV3IEltYWdlIl0gPSAiVmlldyBJbWFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJWaWV3IFJlY29yZGluZyJdID0gIlZpZXcgUmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlZpZXcgU2hhZGVyIl0gPSAiVmlldyBTaGFkZXIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCmluZGV4IDBlN2Y2YTRh NzhmMC4uOGU5ZmQ4OGMxYTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCkBAIC0yMzksMTEgKzIzOSwxMSBAQCBX SS5SZXNvdXJjZSA9IGNsYXNzIFJlc291cmNlIGV4dGVuZHMgV0kuU291cmNlQ29kZQogICAgIHsK ICAgICAgICAgc3dpdGNoIChwcmlvcml0eSkgewogICAgICAgICBjYXNlIFdJLlJlc291cmNlLk5l dHdvcmtQcmlvcml0eS5Mb3c6Ci0gICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkxvdyIp OworICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJMb3ciLCAiTG93IEAgTmV0d29yayBQ cmlvcml0eSIsICJMb3cgbmV0d29yayByZXF1ZXN0IHByaW9yaXR5Iik7CiAgICAgICAgIGNhc2Ug V0kuUmVzb3VyY2UuTmV0d29ya1ByaW9yaXR5Lk1lZGl1bToKLSAgICAgICAgICAgIHJldHVybiBX SS5VSVN0cmluZygiTWVkaXVtIik7CisgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIk1l ZGl1bSIsICJNZWRpdW0gQCBOZXR3b3JrIFByaW9yaXR5IiwgIk1lZGl1bSBuZXR3b3JrIHJlcXVl c3QgcHJpb3JpdHkiKTsKICAgICAgICAgY2FzZSBXSS5SZXNvdXJjZS5OZXR3b3JrUHJpb3JpdHku SGlnaDoKLSAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiSGlnaCIpOworICAgICAgICAg ICAgcmV0dXJuIFdJLlVJU3RyaW5nKCJIaWdoIiwgIkhpZ2ggQCBOZXR3b3JrIFByaW9yaXR5Iiwg IkhpZ2ggbmV0d29yayByZXF1ZXN0IHByaW9yaXR5Iik7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAg ICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzCmlu ZGV4IGVmODk3YTQ0ZmViZi4uMDg4NzAxYjQ5NzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3Lmpz CkBAIC0xMTA0LDI5ICsxMTA0LDI3IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9IGNsYXNzIENQVVRp bWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogCiAgICAgICAgIHRoaXMuX2NsZWFy RW5lcmd5SW1wYWN0VGV4dCgpOwogCi0gICAgICAgIGlmIChhdmVyYWdlID09PSAwKSB7Ci0gICAg ICAgICAgICAgLy8gWmVyby4gKDAlIENQVSwgbWFwcGVkIHRvIDApCi0gICAgICAgICAgICB0aGlz Ll9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiTG93 Iik7Ci0gICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQuY2xhc3NMaXN0 LmFkZCgibG93Iik7Ci0gICAgICAgICAgICB0aGlzLl9lbmVyZ3lDaGFydC52YWx1ZSA9IDA7Ci0g ICAgICAgIH0gZWxzZSBpZiAoYXZlcmFnZSA8PSBDUFVUaW1lbGluZVZpZXcubG93RW5lcmd5VGhy ZXNob2xkKSB7CisgICAgICAgIGlmIChhdmVyYWdlIDw9IENQVVRpbWVsaW5lVmlldy5sb3dFbmVy Z3lUaHJlc2hvbGQpIHsKICAgICAgICAgICAgIC8vIExvdy4gKDw9MyUgQ1BVLCBtYXBwZWQgdG8g MC0xMCkKLSAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC50ZXh0Q29u dGVudCA9IFdJLlVJU3RyaW5nKCJMb3ciKTsKKyAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFj dExhYmVsRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJMb3ciLCAiTG93IEAgRW5l cmd5IEltcGFjdCIsICJFbmVyZ3kgSW1wYWN0OiBMb3ciKTsKICAgICAgICAgICAgIHRoaXMuX2Vu ZXJneUltcGFjdExhYmVsRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsb3ciKTsKLSAgICAgICAgICAg IHRoaXMuX2VuZXJneUNoYXJ0LnZhbHVlID0gbWFwV2l0aEJpYXMoYXZlcmFnZSwgMCwgQ1BVVGlt ZWxpbmVWaWV3Lmxvd0VuZXJneVRocmVzaG9sZCwgMCwgQ1BVVGltZWxpbmVWaWV3Lmxvd0VuZXJn eUdyYXBoQm91bmRhcnksIDAuODUpOworICAgICAgICAgICAgaWYgKGF2ZXJhZ2UgPT09IDApCisg ICAgICAgICAgICAgICAgdGhpcy5fZW5lcmd5Q2hhcnQudmFsdWUgPSAwOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX2VuZXJneUNoYXJ0LnZhbHVlID0gbWFwV2l0aEJp YXMoYXZlcmFnZSwgMCwgQ1BVVGltZWxpbmVWaWV3Lmxvd0VuZXJneVRocmVzaG9sZCwgMCwgQ1BV VGltZWxpbmVWaWV3Lmxvd0VuZXJneUdyYXBoQm91bmRhcnksIDAuODUpOwogICAgICAgICB9IGVs c2UgaWYgKGF2ZXJhZ2UgPD0gQ1BVVGltZWxpbmVWaWV3LiBtZWRpdW1FbmVyZ3lUaHJlc2hvbGQp IHsKICAgICAgICAgICAgIC8vIE1lZGl1bSAoMyUtMzAlIENQVSwgbWFwcGVkIHRvIDEwLTcwKQot ICAgICAgICAgICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0g V0kuVUlTdHJpbmcoIk1lZGl1bSIpOworICAgICAgICAgICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFi ZWxFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIk1lZGl1bSIsICJNZWRpdW0gQCBF bmVyZ3kgSW1wYWN0IiwgIkVuZXJneSBJbXBhY3Q6IE1lZGl1bSIpCiAgICAgICAgICAgICB0aGlz Ll9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibWVkaXVtIik7CiAgICAg ICAgICAgICB0aGlzLl9lbmVyZ3lDaGFydC52YWx1ZSA9IG1hcFdpdGhCaWFzKGF2ZXJhZ2UsIENQ VVRpbWVsaW5lVmlldy5sb3dFbmVyZ3lUaHJlc2hvbGQsIENQVVRpbWVsaW5lVmlldy5tZWRpdW1F bmVyZ3lUaHJlc2hvbGQsIENQVVRpbWVsaW5lVmlldy5sb3dFbmVyZ3lHcmFwaEJvdW5kYXJ5LCBD UFVUaW1lbGluZVZpZXcubWVkaXVtRW5lcmd5R3JhcGhCb3VuZGFyeSwgMC42KTsKICAgICAgICAg fSBlbHNlIGlmIChhdmVyYWdlIDwgQ1BVVGltZWxpbmVWaWV3LiBoaWdoRW5lcmd5VGhyZXNob2xk KSB7CiAgICAgICAgICAgICAvLyBIaWdoLiAoMzAlLTEwMCUgQ1BVLCBtYXBwZWQgdG8gNzAtMTAw KQotICAgICAgICAgICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFiZWxFbGVtZW50LnRleHRDb250ZW50 ID0gV0kuVUlTdHJpbmcoIkhpZ2giKTsKKyAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExh YmVsRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJIaWdoIiwgIkhpZ2ggQCBFbmVy Z3kgSW1wYWN0IiwgIkVuZXJneSBJbXBhY3Q6IEhpZ2giKQogICAgICAgICAgICAgdGhpcy5fZW5l cmd5SW1wYWN0TGFiZWxFbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZ2giKTsKICAgICAgICAgICAg IHRoaXMuX2VuZXJneUNoYXJ0LnZhbHVlID0gbWFwV2l0aEJpYXMoYXZlcmFnZSwgQ1BVVGltZWxp bmVWaWV3Lm1lZGl1bUVuZXJneVRocmVzaG9sZCwgQ1BVVGltZWxpbmVWaWV3LmhpZ2hFbmVyZ3lU aHJlc2hvbGQsIENQVVRpbWVsaW5lVmlldy5tZWRpdW1FbmVyZ3lHcmFwaEJvdW5kYXJ5LCBDUFVU aW1lbGluZVZpZXcuaGlnaEVuZXJneUdyYXBoQm91bmRhcnksIDAuOSk7CiAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAvLyBWZXJ5IEhpZ2guICg+MTAwJSBDUFUsIG1hcHBlZCB0byAxMDAp Ci0gICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQudGV4dENvbnRlbnQg PSBXSS5VSVN0cmluZygiVmVyeSBIaWdoIik7CisgICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBh Y3RMYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiVmVyeSBIaWdoIiwgIlZl cnkgSGlnaCBAIEVuZXJneSBJbXBhY3QiLCAiRW5lcmd5IEltcGFjdDogVmVyeSBIaWdoIikKICAg ICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJo aWdoIik7CiAgICAgICAgICAgICB0aGlzLl9lbmVyZ3lDaGFydC52YWx1ZSA9IDEwMDsKICAgICAg ICAgfQo= 407945 2020-09-03 23:40:46 -0700 2020-09-04 11:23:06 -0700 Patch patch.txt text/plain 7865 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY3ZDM3YmUxOTY3Mi4uMzdhZGI1ZDA3MmVlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wOS0wMyAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBMb2NhbGl6YXRpb246ICJMb3cvTWVkaXVtL0hpZ2giIHN0cmluZ3MgbmVlZCBzZXBhcmF0 ZSBrZXlzIGZvciBkaWZmZXJlbnQgdXNlcyBpbiB0aGUgVUkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjEzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgZW5vdWdoIGNvbnRleHQgdG8gdW5k ZXJzdGFuZCB3aGF0IG5vdW5zICJsb3cvbWVkaXVtL2hpZ2giIGFyZSB1c2VkIHdpdGgKKyAgICAg ICAgKCJpbXBhY3QiIGFuZCAicHJpb3JpdHkiLCBpbiBvdXIgY2FzZSkuIFRoaXMgaXMgbmVjZXNz YXJ5IHRvIGRldGVybWluZSBhZGplY3RpdmVzJworICAgICAgICBncmFtbWF0aWNhbCBnZW5kZXIu CisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanM6CisgICAgICAgIChX SS5SZXNvdXJjZS5kaXNwbGF5TmFtZUZvclByaW9yaXR5KToKKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV0kuQ1BVVGltZWxpbmVW aWV3LnByb3RvdHlwZS5fbGF5b3V0RW5lcmd5Q2hhcnQpOgorICAgICAgICBEcml2ZS1ieTogbWVy Z2UgdHdvIGlmIGJsb2NrcyBpbnRvIG9uZSB0byBtaW5pbWl6ZSBjb2RlIHJlcGV0aXRpb24uCisK IDIwMjAtMDktMDMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFsbG93IHNwZWNpYWwgSmF2YVNjcmlwdCBicmVha3BvaW50cyB0byBi ZSBjb25maWd1cmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA2ZmNmMzU3 YjExNWIuLjU2OTAzOTAxZWM5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC02ODEsNyArNjgxLDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgdGhlIG5hdmlnYXRpb24g c2lkZWJhciAoJXMpIl0gPSAiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlCiBsb2NhbGl6ZWRTdHJp bmdzWyJIaWRlIHRyYW5zcGFyZW5jeSBncmlkIl0gPSAiSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHR5cGUgaW5mb3JtYXRpb24iXSA9ICJIaWRlIHR5cGUg aW5mb3JtYXRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siSGllcmFyY2h5IExldmVsIl0gPSAiSGll cmFyY2h5IExldmVsIjsKLWxvY2FsaXplZFN0cmluZ3NbIkhpZ2giXSA9ICJIaWdoIjsKKy8qIEhp Z2ggbmV0d29yayByZXF1ZXN0IHByaW9yaXR5ICovCitsb2NhbGl6ZWRTdHJpbmdzWyJIaWdoIEAg TmV0d29yayBQcmlvcml0eSJdID0gIkhpZ2giOworLyogRW5lcmd5IEltcGFjdDogSGlnaCAqLwor bG9jYWxpemVkU3RyaW5nc1siSGlnaCBAIFRpbWVsaW5lIEVuZXJneSBJbXBhY3QiXSA9ICJIaWdo IjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZ2hlc3Q6ICVzIl0gPSAiSGlnaGVzdDogJXMiOwogbG9j YWxpemVkU3RyaW5nc1siSG9zdCJdID0gIkhvc3QiOwogbG9jYWxpemVkU3RyaW5nc1siSUNPIl0g PSAiSUNPIjsKQEAgLTc5Miw3ICs3OTUsMTAgQEAgbG9jYWxpemVkU3RyaW5nc1siTG9nIFZhbHVl Il0gPSAiTG9nIFZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZyBXZWJTb2NrZXQiXSA9ICJM b2cgV2ViU29ja2V0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvZzogIl0gPSAiTG9nOiAiOwogbG9j YWxpemVkU3RyaW5nc1siTG9ncyJdID0gIkxvZ3MiOwotbG9jYWxpemVkU3RyaW5nc1siTG93Il0g PSAiTG93IjsKKy8qIExvdyBuZXR3b3JrIHJlcXVlc3QgcHJpb3JpdHkgKi8KK2xvY2FsaXplZFN0 cmluZ3NbIkxvdyBAIE5ldHdvcmsgUHJpb3JpdHkiXSA9ICJMb3ciOworLyogRW5lcmd5IEltcGFj dDogTG93ICovCitsb2NhbGl6ZWRTdHJpbmdzWyJMb3cgQCBUaW1lbGluZSBFbmVyZ3kgSW1wYWN0 Il0gPSAiTG93IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxvd2VzdDogJXMiXSA9ICJMb3dlc3Q6ICVz IjsKIGxvY2FsaXplZFN0cmluZ3NbIk1JTUUgVHlwZSJdID0gIk1JTUUgVHlwZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJNSU1FIFR5cGU6Il0gPSAiTUlNRSBUeXBlOiI7CkBAIC04MTMsNyArODE5LDEw IEBAIGxvY2FsaXplZFN0cmluZ3NbIk1lZGlhIEVsZW1lbnQiXSA9ICJNZWRpYSBFbGVtZW50IjsK IGxvY2FsaXplZFN0cmluZ3NbIk1lZGlhIEV2ZW50Il0gPSAiTWVkaWEgRXZlbnQiOwogbG9jYWxp emVkU3RyaW5nc1siTWVkaWEgTG9nZ2luZzoiXSA9ICJNZWRpYSBMb2dnaW5nOiI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJNZWRpYVNvdXJjZSJdID0gIk1lZGlhU291cmNlIjsKLWxvY2FsaXplZFN0cmlu Z3NbIk1lZGl1bSJdID0gIk1lZGl1bSI7CisvKiBNZWRpdW0gbmV0d29yayByZXF1ZXN0IHByaW9y aXR5ICovCitsb2NhbGl6ZWRTdHJpbmdzWyJNZWRpdW0gQCBOZXR3b3JrIFByaW9yaXR5Il0gPSAi TWVkaXVtIjsKKy8qIEVuZXJneSBJbXBhY3Q6IE1lZGl1bSAqLworbG9jYWxpemVkU3RyaW5nc1si TWVkaXVtIEAgVGltZWxpbmUgRW5lcmd5IEltcGFjdCJdID0gIk1lZGl1bSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJNZW1vcnkiXSA9ICJNZW1vcnkiOwogbG9jYWxpemVkU3RyaW5nc1siTWVtb3J5IENh Y2hlIl0gPSAiTWVtb3J5IENhY2hlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk1lbW9yeSB1c2FnZSBv ZiB0aGlzIGNhbnZhcyJdID0gIk1lbW9yeSB1c2FnZSBvZiB0aGlzIGNhbnZhcyI7CkBAIC0xNDE0 LDcgKzE0MjMsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJWZXJzaW9uIl0gPSAiVmVyc2lvbiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJWZXJ0ZXgiXSA9ICJWZXJ0ZXgiOwogbG9jYWxpemVkU3RyaW5nc1si VmVydGV4IFNoYWRlciJdID0gIlZlcnRleCBTaGFkZXIiOwogbG9jYWxpemVkU3RyaW5nc1siVmVy dGV4L0ZyYWdtZW50IFNoYWRlciJdID0gIlZlcnRleC9GcmFnbWVudCBTaGFkZXIiOwotbG9jYWxp emVkU3RyaW5nc1siVmVyeSBIaWdoIl0gPSAiVmVyeSBIaWdoIjsKKy8qIEVuZXJneSBJbXBhY3Q6 IFZlcnkgSGlnaCAqLworbG9jYWxpemVkU3RyaW5nc1siVmVyeSBIaWdoIEAgVGltZWxpbmUgRW5l cmd5IEltcGFjdCJdID0gIlZlcnkgSGlnaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWaWV3IEltYWdl Il0gPSAiVmlldyBJbWFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJWaWV3IFJlY29yZGluZyJdID0g IlZpZXcgUmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlZpZXcgU2hhZGVyIl0gPSAiVmll dyBTaGFkZXIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL1Jlc291cmNlLmpzCmluZGV4IDBlN2Y2YTRhNzhmMC4uOGU5ZmQ4OGMxYTQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVz b3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L1Jlc291cmNlLmpzCkBAIC0yMzksMTEgKzIzOSwxMSBAQCBXSS5SZXNvdXJjZSA9IGNsYXNzIFJl c291cmNlIGV4dGVuZHMgV0kuU291cmNlQ29kZQogICAgIHsKICAgICAgICAgc3dpdGNoIChwcmlv cml0eSkgewogICAgICAgICBjYXNlIFdJLlJlc291cmNlLk5ldHdvcmtQcmlvcml0eS5Mb3c6Ci0g ICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkxvdyIpOworICAgICAgICAgICAgcmV0dXJu IFdJLlVJU3RyaW5nKCJMb3ciLCAiTG93IEAgTmV0d29yayBQcmlvcml0eSIsICJMb3cgbmV0d29y ayByZXF1ZXN0IHByaW9yaXR5Iik7CiAgICAgICAgIGNhc2UgV0kuUmVzb3VyY2UuTmV0d29ya1By aW9yaXR5Lk1lZGl1bToKLSAgICAgICAgICAgIHJldHVybiBXSS5VSVN0cmluZygiTWVkaXVtIik7 CisgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIk1lZGl1bSIsICJNZWRpdW0gQCBOZXR3 b3JrIFByaW9yaXR5IiwgIk1lZGl1bSBuZXR3b3JrIHJlcXVlc3QgcHJpb3JpdHkiKTsKICAgICAg ICAgY2FzZSBXSS5SZXNvdXJjZS5OZXR3b3JrUHJpb3JpdHkuSGlnaDoKLSAgICAgICAgICAgIHJl dHVybiBXSS5VSVN0cmluZygiSGlnaCIpOworICAgICAgICAgICAgcmV0dXJuIFdJLlVJU3RyaW5n KCJIaWdoIiwgIkhpZ2ggQCBOZXR3b3JrIFByaW9yaXR5IiwgIkhpZ2ggbmV0d29yayByZXF1ZXN0 IHByaW9yaXR5Iik7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gbnVsbDsK ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzCmluZGV4IGVmODk3YTQ0ZmViZi4uMjVk MGQzNWM4NTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DUFVUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzCkBAIC0xMTA0LDI5ICsxMTA0LDI0 IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9IGNsYXNzIENQVVRpbWVsaW5lVmlldyBleHRlbmRzIFdJ LlRpbWVsaW5lVmlldwogCiAgICAgICAgIHRoaXMuX2NsZWFyRW5lcmd5SW1wYWN0VGV4dCgpOwog Ci0gICAgICAgIGlmIChhdmVyYWdlID09PSAwKSB7Ci0gICAgICAgICAgICAgLy8gWmVyby4gKDAl IENQVSwgbWFwcGVkIHRvIDApCi0gICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVs ZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiTG93Iik7Ci0gICAgICAgICAgICB0aGlz Ll9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibG93Iik7Ci0gICAgICAg ICAgICB0aGlzLl9lbmVyZ3lDaGFydC52YWx1ZSA9IDA7Ci0gICAgICAgIH0gZWxzZSBpZiAoYXZl cmFnZSA8PSBDUFVUaW1lbGluZVZpZXcubG93RW5lcmd5VGhyZXNob2xkKSB7CisgICAgICAgIGlm IChhdmVyYWdlIDw9IENQVVRpbWVsaW5lVmlldy5sb3dFbmVyZ3lUaHJlc2hvbGQpIHsKICAgICAg ICAgICAgIC8vIExvdy4gKDw9MyUgQ1BVLCBtYXBwZWQgdG8gMC0xMCkKLSAgICAgICAgICAgIHRo aXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJM b3ciKTsKKyAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC50ZXh0Q29u dGVudCA9IFdJLlVJU3RyaW5nKCJMb3ciLCAiTG93IEAgVGltZWxpbmUgRW5lcmd5IEltcGFjdCIs ICJFbmVyZ3kgSW1wYWN0OiBMb3ciKTsKICAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExh YmVsRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsb3ciKTsKICAgICAgICAgICAgIHRoaXMuX2VuZXJn eUNoYXJ0LnZhbHVlID0gbWFwV2l0aEJpYXMoYXZlcmFnZSwgMCwgQ1BVVGltZWxpbmVWaWV3Lmxv d0VuZXJneVRocmVzaG9sZCwgMCwgQ1BVVGltZWxpbmVWaWV3Lmxvd0VuZXJneUdyYXBoQm91bmRh cnksIDAuODUpOwogICAgICAgICB9IGVsc2UgaWYgKGF2ZXJhZ2UgPD0gQ1BVVGltZWxpbmVWaWV3 LiBtZWRpdW1FbmVyZ3lUaHJlc2hvbGQpIHsKICAgICAgICAgICAgIC8vIE1lZGl1bSAoMyUtMzAl IENQVSwgbWFwcGVkIHRvIDEwLTcwKQotICAgICAgICAgICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFi ZWxFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIk1lZGl1bSIpOworICAgICAgICAg ICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJp bmcoIk1lZGl1bSIsICJNZWRpdW0gQCBUaW1lbGluZSBFbmVyZ3kgSW1wYWN0IiwgIkVuZXJneSBJ bXBhY3Q6IE1lZGl1bSIpCiAgICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1l bnQuY2xhc3NMaXN0LmFkZCgibWVkaXVtIik7CiAgICAgICAgICAgICB0aGlzLl9lbmVyZ3lDaGFy dC52YWx1ZSA9IG1hcFdpdGhCaWFzKGF2ZXJhZ2UsIENQVVRpbWVsaW5lVmlldy5sb3dFbmVyZ3lU aHJlc2hvbGQsIENQVVRpbWVsaW5lVmlldy5tZWRpdW1FbmVyZ3lUaHJlc2hvbGQsIENQVVRpbWVs aW5lVmlldy5sb3dFbmVyZ3lHcmFwaEJvdW5kYXJ5LCBDUFVUaW1lbGluZVZpZXcubWVkaXVtRW5l cmd5R3JhcGhCb3VuZGFyeSwgMC42KTsKICAgICAgICAgfSBlbHNlIGlmIChhdmVyYWdlIDwgQ1BV VGltZWxpbmVWaWV3LiBoaWdoRW5lcmd5VGhyZXNob2xkKSB7CiAgICAgICAgICAgICAvLyBIaWdo LiAoMzAlLTEwMCUgQ1BVLCBtYXBwZWQgdG8gNzAtMTAwKQotICAgICAgICAgICAgdGhpcy5fZW5l cmd5SW1wYWN0TGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIkhpZ2giKTsK KyAgICAgICAgICAgIHRoaXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC50ZXh0Q29udGVudCA9 IFdJLlVJU3RyaW5nKCJIaWdoIiwgIkhpZ2ggQCBUaW1lbGluZSBFbmVyZ3kgSW1wYWN0IiwgIkVu ZXJneSBJbXBhY3Q6IEhpZ2giKQogICAgICAgICAgICAgdGhpcy5fZW5lcmd5SW1wYWN0TGFiZWxF bGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZ2giKTsKICAgICAgICAgICAgIHRoaXMuX2VuZXJneUNo YXJ0LnZhbHVlID0gbWFwV2l0aEJpYXMoYXZlcmFnZSwgQ1BVVGltZWxpbmVWaWV3Lm1lZGl1bUVu ZXJneVRocmVzaG9sZCwgQ1BVVGltZWxpbmVWaWV3LmhpZ2hFbmVyZ3lUaHJlc2hvbGQsIENQVVRp bWVsaW5lVmlldy5tZWRpdW1FbmVyZ3lHcmFwaEJvdW5kYXJ5LCBDUFVUaW1lbGluZVZpZXcuaGln aEVuZXJneUdyYXBoQm91bmRhcnksIDAuOSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICAvLyBWZXJ5IEhpZ2guICg+MTAwJSBDUFUsIG1hcHBlZCB0byAxMDApCi0gICAgICAgICAgICB0 aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygi VmVyeSBIaWdoIik7CisgICAgICAgICAgICB0aGlzLl9lbmVyZ3lJbXBhY3RMYWJlbEVsZW1lbnQu dGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiVmVyeSBIaWdoIiwgIlZlcnkgSGlnaCBAIFRpbWVs aW5lIEVuZXJneSBJbXBhY3QiLCAiRW5lcmd5IEltcGFjdDogVmVyeSBIaWdoIikKICAgICAgICAg ICAgIHRoaXMuX2VuZXJneUltcGFjdExhYmVsRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJoaWdoIik7 CiAgICAgICAgICAgICB0aGlzLl9lbmVyZ3lDaGFydC52YWx1ZSA9IDEwMDsKICAgICAgICAgfQo=