141948 2015-02-23 19:33:38 -0800 Web Inspector: Eliminate console-formatted-* class names in favor of formatted-* 2015-03-23 22:47:04 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1071501 0 joepeck 2015-02-23 19:33:38 -0800 * SUMMARY Now that we have moved value formatting outside of the console, eliminate the old console-formatted class names in favor of the FormattedValue class names. 1071513 1 247192 joepeck 2015-02-23 19:59:39 -0800 Created attachment 247192 [PATCH] Proposed Fix 1071843 2 joepeck 2015-02-24 16:45:30 -0800 http://trac.webkit.org/changeset/180597 247192 2015-02-23 19:59:39 -0800 2015-02-23 21:07:02 -0800 [PATCH] Proposed Fix formatted-class.patch text/plain 18119 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI2OWRhYWYuLmZjMWI0YzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYwIEBACiAyMDE1LTAyLTIzICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxpbWlu YXRlIGNvbnNvbGUtZm9ybWF0dGVkLSogY2xhc3MgbmFtZXMgaW4gZmF2b3Igb2YgZm9ybWF0dGVk LSoKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTk0 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yTm9kZSk6CisgICAgICAgIEhlbHBlciBm b3IgZm9ybWF0dGluZyBhIG5vZGUgYXMgYSBET01UcmVlT3V0bGluZS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VJbXBsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5fZm9ybWF0 UGFyYW1ldGVyQXNTdHJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl SW1wbC5wcm90b3R5cGUuX2Zvcm1hdFBhcmFtZXRlckFzTm9kZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5hcHBlbmRVbmRlZmluZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUuX3ByaW50QXJy YXkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUu KTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3 LmNzczoKKyAgICAgICAgKC5jb25zb2xlLXVzZXItY29tbWFuZC1yZXN1bHQpOgorICAgICAgICAo LmNvbnNvbGUtZm9ybWF0dGVkLW9iamVjdCk6IERlbGV0ZWQuCisgICAgICAgICguY29uc29sZS1v YmplY3QtcHJldmlldyk6IERlbGV0ZWQuCisgICAgICAgICguZXhwYW5kZWQgLmNvbnNvbGUtb2Jq ZWN0LXByZXZpZXcpOiBEZWxldGVkLgorICAgICAgICAoLmNvbnNvbGUtb2JqZWN0LXByZXZpZXcg Lm5hbWUpOiBEZWxldGVkLgorICAgICAgICAoLmV4cGFuZGVkIC5jb25zb2xlLW9iamVjdC1wcmV2 aWV3ID4gLmNvbnNvbGUtb2JqZWN0LXByZXZpZXctYm9keSk6IERlbGV0ZWQuCisgICAgICAgICgu Y29uc29sZS1vYmplY3QtcHJldmlldyA+IC5jb25zb2xlLW9iamVjdC1wcmV2aWV3LW5hbWUuY29u c29sZS1vYmplY3QtcHJldmlldy1uYW1lLU9iamVjdCk6IERlbGV0ZWQuCisgICAgICAgICguY29u c29sZS1vYmplY3QtcHJldmlldy1ib2R5IC5jb25zb2xlLW9iamVjdC1wcmV2aWV3LW5hbWUuY29u c29sZS1vYmplY3QtcHJldmlldy1uYW1lLU9iamVjdCk6IERlbGV0ZWQuCisgICAgICAgICguZXhw YW5kZWQgLmNvbnNvbGUtb2JqZWN0LXByZXZpZXcgPiAuY29uc29sZS1vYmplY3QtcHJldmlldy1u YW1lLmNvbnNvbGUtb2JqZWN0LXByZXZpZXctbmFtZS1PYmplY3QpOiBEZWxldGVkLgorICAgICAg ICAoLmNvbnNvbGUtZm9ybWF0dGVkLW9iamVjdCwgLmNvbnNvbGUtZm9ybWF0dGVkLW5vZGUsIC5j b25zb2xlLWZvcm1hdHRlZC1lcnJvciwgLmNvbnNvbGUtZm9ybWF0dGVkLW1hcCwgLmNvbnNvbGUt Zm9ybWF0dGVkLXNldCwgLmNvbnNvbGUtZm9ybWF0dGVkLXdlYWttYXApOiBEZWxldGVkLgorICAg ICAgICAoOm1hdGNoZXMoLmNvbnNvbGUtZm9ybWF0dGVkLW9iamVjdCwgLmNvbnNvbGUtZm9ybWF0 dGVkLW5vZGUsIC5jb25zb2xlLWZvcm1hdHRlZC1lcnJvciwgLmNvbnNvbGUtZm9ybWF0dGVkLW1h cCwgLmNvbnNvbGUtZm9ybWF0dGVkLXNldCwgLmNvbnNvbGUtZm9ybWF0dGVkLXdlYWttYXApIC5z ZWN0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90 eXBlLl9sZWZ0QXJyb3dXYXNQcmVzc2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250 ZW50Vmlldy5wcm90b3R5cGUuX3JpZ2h0QXJyb3dXYXNQcmVzc2VkKToKKyAgICAgICAgQWRkIEZJ WE1FcyBzaW5jZSB0aGlzIHdpbGwgbm8gbG9uZ2VyIHdvcmsgd2l0aCBPYmplY3RUcmVlLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RQcmV2aWV3Vmlldy5jc3M6CisgICAg ICAgICgub2JqZWN0LXByZXZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2Jq ZWN0VHJlZVZpZXcuY3NzOgorICAgICAgICAoLm9iamVjdC10cmVlKToKKyAgICAgICAgQ29weSBv dmVyIHRoZSBmb250IHN0eWxlcyBmcm9tIGNvbnNvbGUtZm9ybWF0dGVkLW9iamVjdC4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUu dXBkYXRlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRp dG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3Rv dHlwZS5fc2hvd1BvcG92ZXJGb3JGdW5jdGlvbi5kaWRHZXREZXRhaWxzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUuX3Nob3dQb3BvdmVyRm9y RnVuY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnBy b3RvdHlwZS5fc2hvd1BvcG92ZXJGb3JTdHJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS5fc2hvd1BvcG92ZXJGb3JSZWdFeHApOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZS5fc2hvd1Bv cG92ZXJGb3JOdW1iZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRp dG9yLnByb3RvdHlwZS5fc2hvd1BvcG92ZXJGb3JCb29sZWFuKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUuX3Nob3dQb3BvdmVyRm9yTnVsbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl9z aG93UG9wb3ZlckZvclVuZGVmaW5lZCk6CisgICAgICAgIENvbnZlcnQgdG8gZm9ybWF0dGVkIHZh bHVlIGNsYXNzIG5hbWVzLgorCisyMDE1LTAyLTIzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIHVudXNlZCBjb25z b2xlLW9iamVjdC1wcmV2aWV3IHN0eWxlcyAtIHJlcGxhY2VkIGJ5IE9iamVjdFByZXZpZXdWaWV3 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE5NDUK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29uc29sZU1lc3NhZ2VJbXBsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29uc29sZU1lc3NhZ2VJbXBsLmpzCmluZGV4IDFlNjFmZWMuLjJmNjE3NWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNv bGVNZXNzYWdlSW1wbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db25zb2xlTWVzc2FnZUltcGwuanMKQEAgLTI4MSw3ICsyODEsNiBAQCBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZvcm1h dHRlciA9IHRoaXMuX2Zvcm1hdFBhcmFtZXRlckFzVmFsdWU7CiAKICAgICAgICAgdmFyIHNwYW4g PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIHNwYW4uY2xhc3NOYW1l ID0gImNvbnNvbGUtZm9ybWF0dGVkLSIgKyB0eXBlOwogCiAgICAgICAgIGlmICh0aGlzLl9pc0V4 cGFuZGFibGUob3V0cHV0KSkKICAgICAgICAgICAgIHNwYW4uY2xhc3NMaXN0LmFkZCgiZXhwYW5k YWJsZSIpOwpAQCAtMzA0LDI5ICszMDMsMTMgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdl SW1wbC5wcm90b3R5cGUgPSB7CiAgICAgX2Zvcm1hdFBhcmFtZXRlckFzU3RyaW5nOiBmdW5jdGlv bihvdXRwdXQsIGVsZW0pCiAgICAgewogICAgICAgICB2YXIgc3BhbiA9IFdlYkluc3BlY3Rvci5G b3JtYXR0ZWRWYWx1ZS5jcmVhdGVMaW5raWZpZWRFbGVtZW50U3RyaW5nKG91dHB1dC5kZXNjcmlw dGlvbik7Ci0gICAgICAgIGVsZW0uY2xhc3NMaXN0LnJlbW92ZSgiY29uc29sZS1mb3JtYXR0ZWQt c3RyaW5nIik7CiAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoc3Bhbik7CiAgICAgfSwKIAogICAg IF9mb3JtYXRQYXJhbWV0ZXJBc05vZGU6IGZ1bmN0aW9uKG9iamVjdCwgZWxlbSkKICAgICB7Ci0g ICAgICAgIGZ1bmN0aW9uIHByaW50Tm9kZShub2RlSWQpCi0gICAgICAgIHsKLSAgICAgICAgICAg IGlmICghbm9kZUlkKSB7Ci0gICAgICAgICAgICAgICAgLy8gU29tZXRpbWVzIERPTSBpcyBsb2Fk ZWQgYWZ0ZXIgdGhlIHN5bmMgbWVzc2FnZSBpcyBiZWluZyBmb3JtYXR0ZWQsIHNvIHdlIGdldCBu bwotICAgICAgICAgICAgICAgIC8vIG5vZGVJZCBoZXJlLiBTbyB3ZSBmYWxsIGJhY2sgdG8gb2Jq ZWN0IGZvcm1hdHRpbmcgaGVyZS4KLSAgICAgICAgICAgICAgICB0aGlzLl9mb3JtYXRQYXJhbWV0 ZXJBc09iamVjdChvYmplY3QsIGVsZW0sIHRydWUpOwotICAgICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHZhciB0cmVlT3V0bGluZSA9IG5ldyBXZWJJbnNw ZWN0b3IuRE9NVHJlZU91dGxpbmUoZmFsc2UsIGZhbHNlLCB0cnVlKTsKLSAgICAgICAgICAgIHRy ZWVPdXRsaW5lLnNldFZpc2libGUodHJ1ZSk7Ci0gICAgICAgICAgICB0cmVlT3V0bGluZS5yb290 RE9NTm9kZSA9IFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5ub2RlRm9ySWQobm9kZUlkKTsK LSAgICAgICAgICAgIHRyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgib3V0bGluZS1k aXNjbG9zdXJlIik7Ci0gICAgICAgICAgICBpZiAoIXRyZWVPdXRsaW5lLmNoaWxkcmVuWzBdLmhh c0NoaWxkcmVuKQotICAgICAgICAgICAgICAgIHRyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0 LmFkZCgic2luZ2xlLW5vZGUiKTsKLSAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQodHJlZU91 dGxpbmUuZWxlbWVudCk7Ci0gICAgICAgIH0KLSAgICAgICAgb2JqZWN0LnB1c2hOb2RlVG9Gcm9u dGVuZChwcmludE5vZGUuYmluZCh0aGlzKSk7CisgICAgICAgIHZhciBzcGFuID0gV2ViSW5zcGVj dG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JOb2RlKG9iamVjdCk7CisgICAgICAg IGVsZW0uYXBwZW5kQ2hpbGQoc3Bhbik7CiAgICAgfSwKIAogICAgIF9mb3JtYXRQYXJhbWV0ZXJB c0FycmF5OiBmdW5jdGlvbihhcnIsIGVsZW0pCkBAIC00NzYsNyArNDU5LDcgQEAgV2ViSW5zcGVj dG9yLkNvbnNvbGVNZXNzYWdlSW1wbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAg ICAgIGlmIChpbmRleCAtIGxhc3ROb25FbXB0eUluZGV4IDw9IDEpCiAgICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgdmFyIHNwYW4gPSBlbGVtLmNyZWF0ZUNoaWxkKCJzcGFuIiwg ImNvbnNvbGUtZm9ybWF0dGVkLXVuZGVmaW5lZCIpOworICAgICAgICAgICAgdmFyIHNwYW4gPSBl bGVtLmNyZWF0ZUNoaWxkKCJzcGFuIiwgImZvcm1hdHRlZC11bmRlZmluZWQiKTsKICAgICAgICAg ICAgIHNwYW4udGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInVuZGVmaW5lZCDD lyAlZCIpLmZvcm1hdChpbmRleCAtIGxhc3ROb25FbXB0eUluZGV4IC0gMSk7CiAgICAgICAgIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Rm9ybWF0dGVkVmFsdWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qcwppbmRleCBjY2UxZGEwLi4wYjFjYzlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1 ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3Jt YXR0ZWRWYWx1ZS5qcwpAQCAtMjgsMTIgKzI4LDEyIEBAIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRW YWx1ZSA9IHt9OwogV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNsYXNzTmFtZUZvclR5cGVz ID0gZnVuY3Rpb24odHlwZSwgc3VidHlwZSkKIHsKICAgICByZXR1cm4gImZvcm1hdHRlZC0iICsg KHN1YnR5cGUgPyBzdWJ0eXBlIDogdHlwZSk7Ci19Cit9OwogCiBXZWJJbnNwZWN0b3IuRm9ybWF0 dGVkVmFsdWUuY2xhc3NOYW1lRm9yT2JqZWN0ID0gZnVuY3Rpb24ob2JqZWN0KQogewogICAgIHJl dHVybiBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkVmFsdWUuY2xhc3NOYW1lRm9yVHlwZXMob2JqZWN0 LnR5cGUsIG9iamVjdC5zdWJ0eXBlKTsKLX0KK307CiAKIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRW YWx1ZS5jcmVhdGVMaW5raWZpZWRFbGVtZW50U3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nKQogewpA QCAtNDMsNyArNDMsMzEgQEAgV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUxpbmtp ZmllZEVsZW1lbnRTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcpCiAgICAgc3Bhbi5hcHBlbmRDaGls ZChXZWJJbnNwZWN0b3IubGlua2lmeVN0cmluZ0FzRnJhZ21lbnQoc3RyaW5nLnJlcGxhY2UoLyIv ZywgIlxcXCIiKSkpOwogICAgIHNwYW4uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoIlwiIikpOwogICAgIHJldHVybiBzcGFuOwotfQorfTsKKworV2ViSW5zcGVjdG9yLkZvcm1h dHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JOb2RlID0gZnVuY3Rpb24ob2JqZWN0KQoreworICAg IHZhciBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgIHNwYW4uY2xh c3NOYW1lID0gImZvcm1hdHRlZC1ub2RlIjsKKworICAgIG9iamVjdC5wdXNoTm9kZVRvRnJvbnRl bmQoZnVuY3Rpb24obm9kZUlkKSB7CisgICAgICAgIGlmICghbm9kZUlkKSB7CisgICAgICAgICAg ICBzcGFuLnRleHRDb250ZW50ID0gb2JqZWN0LmRlc2NyaXB0aW9uOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKKyAgICAgICAgLy8gRklYTUU6IEV4dHJhY3QgdGhlIHN0eWxlcyBm b3IgYSBmb3JtYXR0ZWQtbm9kZSBvdXRsaW5lLWRpc2Nsb3N1cmUgZnJvbSB0aGUgTG9nQ29udGVu dFZpZXcuCisgICAgICAgIHZhciB0cmVlT3V0bGluZSA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NVHJl ZU91dGxpbmUoZmFsc2UsIGZhbHNlLCB0cnVlKTsKKyAgICAgICAgdHJlZU91dGxpbmUuc2V0Vmlz aWJsZSh0cnVlKTsKKyAgICAgICAgdHJlZU91dGxpbmUucm9vdERPTU5vZGUgPSBXZWJJbnNwZWN0 b3IuZG9tVHJlZU1hbmFnZXIubm9kZUZvcklkKG5vZGVJZCk7CisgICAgICAgIHRyZWVPdXRsaW5l LmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgib3V0bGluZS1kaXNjbG9zdXJlIik7CisgICAgICAgIGlm ICghdHJlZU91dGxpbmUuY2hpbGRyZW5bMF0uaGFzQ2hpbGRyZW4pCisgICAgICAgICAgICB0cmVl T3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInNpbmdsZS1ub2RlIik7CisgICAgICAgIHNw YW4uYXBwZW5kQ2hpbGQodHJlZU91dGxpbmUuZWxlbWVudCk7CisgICAgfSk7CisKKyAgICByZXR1 cm4gc3BhbjsKK307CiAKIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50 Rm9yVHlwZXNBbmRWYWx1ZSA9IGZ1bmN0aW9uKHR5cGUsIHN1YnR5cGUsIGRpc3BsYXlTdHJpbmcs IGlzUHJldmlldywgaGFkRXhjZXB0aW9uKQogewpAQCAtNzEsMTkgKzk1LDE5IEBAIFdlYkluc3Bl Y3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZSA9IGZ1bmN0 aW9uKHR5cGUsIHN1YnR5CiAgICAgLy8gRXZlcnl0aGluZyBlbHNlLCB0aGUgZGVzY3JpcHRpb24v dmFsdWUgc3RyaW5nLgogICAgIHNwYW4udGV4dENvbnRlbnQgPSBkaXNwbGF5U3RyaW5nOwogICAg IHJldHVybiBzcGFuOwotfQorfTsKIAogV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0 ZUVsZW1lbnRGb3JSZW1vdGVPYmplY3QgPSBmdW5jdGlvbihvYmplY3QsIGhhZEV4Y2VwdGlvbikK IHsKICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRG b3JUeXBlc0FuZFZhbHVlKG9iamVjdC50eXBlLCBvYmplY3Quc3VidHlwZSwgb2JqZWN0LmRlc2Ny aXB0aW9uLCBmYWxzZSwgaGFkRXhjZXB0aW9uKTsKLX0KK307CiAKIFdlYkluc3BlY3Rvci5Gb3Jt YXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yT2JqZWN0UHJldmlldyA9IGZ1bmN0aW9uKG9iamVj dFByZXZpZXcpCiB7CiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVh dGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZShvYmplY3RQcmV2aWV3LnR5cGUsIG9iamVjdFByZXZp ZXcuc3VidHlwZSwgb2JqZWN0UHJldmlldy5kZXNjcmlwdGlvbiwgdHJ1ZSwgZmFsc2UpOwotfQor fTsKIAogV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRGb3JQcm9wZXJ0 eVByZXZpZXcgPSBmdW5jdGlvbihwcm9wZXJ0eVByZXZpZXcpCiB7CiAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5Gb3JtYXR0ZWRWYWx1ZS5jcmVhdGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZShwcm9w ZXJ0eVByZXZpZXcudHlwZSwgcHJvcGVydHlQcmV2aWV3LnN1YnR5cGUsIHByb3BlcnR5UHJldmll dy52YWx1ZSwgdHJ1ZSwgZmFsc2UpOwotfQorfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmNzcwppbmRl eCBhMTM2MjA2Li4zNzMxNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuY3NzCkBAIC00MSw4ICs0 MSw3IEBACiB9CiAKIC5jb25zb2xlLXVzZXItY29tbWFuZCwKLS5jb25zb2xlLXVzZXItY29tbWFu ZC1yZXN1bHQsCi0uY29uc29sZS1mb3JtYXR0ZWQtb2JqZWN0IHsKKy5jb25zb2xlLXVzZXItY29t bWFuZC1yZXN1bHQgewogICAgIGZvbnQtZmFtaWx5OiBNZW5sbywgbW9ub3NwYWNlOwogICAgIGZv bnQtc2l6ZTogMTFweDsKIH0KQEAgLTI4OSw0NSArMjg4LDYgQEAKICAgICBkaXNwbGF5OiBub25l OwogfQogCi0uY29uc29sZS1mb3JtYXR0ZWQtb2JqZWN0LCAuY29uc29sZS1mb3JtYXR0ZWQtbm9k ZSwgLmNvbnNvbGUtZm9ybWF0dGVkLWVycm9yLCAuY29uc29sZS1mb3JtYXR0ZWQtbWFwLCAuY29u c29sZS1mb3JtYXR0ZWQtc2V0LCAuY29uc29sZS1mb3JtYXR0ZWQtd2Vha21hcCB7Ci0gICAgcG9z aXRpb246IHJlbGF0aXZlOwotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICB2ZXJ0aWNh bC1hbGlnbjogYmFzZWxpbmU7Ci0gICAgY29sb3I6IGJsYWNrOwotfQotCi06bWF0Y2hlcyguY29u c29sZS1mb3JtYXR0ZWQtb2JqZWN0LCAuY29uc29sZS1mb3JtYXR0ZWQtbm9kZSwgLmNvbnNvbGUt Zm9ybWF0dGVkLWVycm9yLCAuY29uc29sZS1mb3JtYXR0ZWQtbWFwLCAuY29uc29sZS1mb3JtYXR0 ZWQtc2V0LCAuY29uc29sZS1mb3JtYXR0ZWQtd2Vha21hcCkgLnNlY3Rpb24gewotICAgIHBvc2l0 aW9uOiBzdGF0aWM7Ci19Ci0KLTptYXRjaGVzKC5jb25zb2xlLWZvcm1hdHRlZC1vYmplY3QsIC5j b25zb2xlLWZvcm1hdHRlZC1ub2RlLCAuY29uc29sZS1mb3JtYXR0ZWQtZXJyb3IsIC5jb25zb2xl LWZvcm1hdHRlZC1tYXAsIC5jb25zb2xlLWZvcm1hdHRlZC1zZXQsIC5jb25zb2xlLWZvcm1hdHRl ZC13ZWFrbWFwKSAucHJvcGVydGllcyB7Ci0gICAgcGFkZGluZy1sZWZ0OiAwICFpbXBvcnRhbnQ7 Ci19Ci0KLS5jb25zb2xlLWZvcm1hdHRlZC1udW1iZXIgewotICAgIGNvbG9yOiByZ2IoMjgsIDAs IDIwNyk7Ci19Ci0KLS5jb25zb2xlLWZvcm1hdHRlZC1zdHJpbmcsIC5jb25zb2xlLWZvcm1hdHRl ZC1yZWdleHAgewotICAgIHdoaXRlLXNwYWNlOiBwcmU7Ci19Ci0KLS5jb25zb2xlLWZvcm1hdHRl ZC1zdHJpbmcgewotICAgIGNvbG9yOiByZ2IoMTk2LCAyNiwgMjIpOwotfQotCi0uY29uc29sZS1m b3JtYXR0ZWQtcmVnZXhwIHsKLSAgICBjb2xvcjogcmdiKDI1NSwgODgsIDApOwotfQotCi0uY29u c29sZS1mb3JtYXR0ZWQtc3ltYm9sIHsKLSAgICBjb2xvcjogcmdiKDYzLCAxNjksIDE1Nik7Ci19 Ci0KLS5jb25zb2xlLWZvcm1hdHRlZC1udWxsLCAuY29uc29sZS1mb3JtYXR0ZWQtdW5kZWZpbmVk IHsKLSAgICBjb2xvcjogcmdiKDEyOCwgMTI4LCAxMjgpOwotfQotCiAuZXJyb3ItbWVzc2FnZSB7 CiAgICAgY29sb3I6IHJlZDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5kZXggMjcyNmE3ZS4u MGI2NTFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAgLTc4NCw2ICs3ODQsNyBAQCBXZWJJ bnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGVs c2UKICAgICAgICAgICAgICAgICAgICAgb3V0bGluZVRpdGxlLnRyZWVFbGVtZW50LmNvbGxhcHNl KCk7CiAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTQxOTQ5PiBXZWIgSW5zcGVjdG9yOiBSaWdodC9MZWZ0IGFycm93 IG5vIGxvbmdlciB3b3JrcyBpbiBjb25zb2xlIHRvIGV4cGFuZC9jb2xsYXBzZSBPYmplY3RUcmVl cwogICAgICAgICAgICAgICAgIHZhciBvdXRsaW5lU2VjdGlvbiA9IGN1cnJlbnRNZXNzYWdlLnF1 ZXJ5U2VsZWN0b3IoIi5jb25zb2xlLWZvcm1hdHRlZC1vYmplY3QgPiAuc2VjdGlvbiIpOwogICAg ICAgICAgICAgICAgIGlmIChvdXRsaW5lU2VjdGlvbikKICAgICAgICAgICAgICAgICAgICAgb3V0 bGluZVNlY3Rpb24uX3NlY3Rpb24uY29sbGFwc2UoKTsKQEAgLTgxNSw2ICs4MTYsNyBAQCBXZWJJ bnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGVs c2UKICAgICAgICAgICAgICAgICAgICAgb3V0bGluZVRpdGxlLnRyZWVFbGVtZW50LmV4cGFuZCgp OwogICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBGSVhNRTogPGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzE0MTk0OT4gV2ViIEluc3BlY3RvcjogUmlnaHQvTGVmdCBhcnJvdyBu byBsb25nZXIgd29ya3MgaW4gY29uc29sZSB0byBleHBhbmQvY29sbGFwc2UgT2JqZWN0VHJlZXMK ICAgICAgICAgICAgICAgICB2YXIgb3V0bGluZVNlY3Rpb24gPSBjdXJyZW50TWVzc2FnZS5xdWVy eVNlbGVjdG9yKCIuY29uc29sZS1mb3JtYXR0ZWQtb2JqZWN0ID4gLnNlY3Rpb24iKTsKICAgICAg ICAgICAgICAgICBpZiAob3V0bGluZVNlY3Rpb24pIHsKICAgICAgICAgICAgICAgICAgICAgb3V0 bGluZVNlY3Rpb24uX3NlY3Rpb24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2VjdGlv bi5FdmVudC5WaXNpYmxlQ29udGVudERpZENoYW5nZSwgdGhpcy5fcHJvcGVydGllc1NlY3Rpb25E aWRVcGRhdGVDb250ZW50LCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByZXZpZXdWaWV3LmNzcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByZXZpZXdWaWV3LmNzcwppbmRl eCA4NjMxODUyLi5kNDkyZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9PYmplY3RQcmV2aWV3Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJldmlld1ZpZXcuY3NzCkBAIC0y NSw2ICsyNSw4IEBACiAKIC5vYmplY3QtcHJldmlldyB7CiAgICAgZm9udC1zdHlsZTogaXRhbGlj OworICAgIGZvbnQtZmFtaWx5OiBNZW5sbywgbW9ub3NwYWNlOworICAgIGZvbnQtc2l6ZTogMTFw eDsKIH0KIAogLm9iamVjdC1wcmV2aWV3Lmxvc3NsZXNzIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByb3BlcnRpZXNTZWN0aW9u LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJv cGVydGllc1NlY3Rpb24uanMKaW5kZXggMzM3NzVhYy4uMjg0YWU0MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJvcGVydGllc1Nl Y3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv T2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAgLTIyMSw5ICsyMjEsOSBAQCBXZWJJbnNwZWN0 b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0 aGlzLnByb3BlcnR5Lndhc1Rocm93bikKICAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LmNs YXNzTGlzdC5hZGQoImVycm9yIik7CiAgICAgICAgIGlmICh0aGlzLnByb3BlcnR5LnZhbHVlLnN1 YnR5cGUpCi0gICAgICAgICAgICB0aGlzLnZhbHVlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJjb25z b2xlLWZvcm1hdHRlZC0iICsgdGhpcy5wcm9wZXJ0eS52YWx1ZS5zdWJ0eXBlKTsKKyAgICAgICAg ICAgIHRoaXMudmFsdWVFbGVtZW50LmNsYXNzTGlzdC5hZGQoImZvcm1hdHRlZC0iICsgdGhpcy5w cm9wZXJ0eS52YWx1ZS5zdWJ0eXBlKTsKICAgICAgICAgZWxzZSBpZiAodGhpcy5wcm9wZXJ0eS52 YWx1ZS50eXBlKQotICAgICAgICAgICAgdGhpcy52YWx1ZUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi Y29uc29sZS1mb3JtYXR0ZWQtIiArIHRoaXMucHJvcGVydHkudmFsdWUudHlwZSk7CisgICAgICAg ICAgICB0aGlzLnZhbHVlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJmb3JtYXR0ZWQtIiArIHRoaXMu cHJvcGVydHkudmFsdWUudHlwZSk7CiAgICAgICAgIGlmICh0aGlzLnByb3BlcnR5LnZhbHVlLnN1 YnR5cGUgPT09ICJub2RlIikKICAgICAgICAgICAgIHRoaXMudmFsdWVFbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29udGV4dE1lbnVFdmVudEZpcmVkLmJpbmQo dGhpcyksIGZhbHNlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzCmluZGV4IDg5OGJjMWIuLjcy NWVmZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL09iamVjdFRyZWVWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5jc3MKQEAgLTI1LDYgKzI1LDkgQEAKIAogLm9i amVjdC10cmVlIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisKKyAgICBmb250LWZhbWlseTog TWVubG8sIG1vbm9zcGFjZTsKKyAgICBmb250LXNpemU6IDExcHg7CiB9CiAKIC5vYmplY3QtdHJl ZSA+IDptYXRjaGVzKC50aXRsZSwgLm9iamVjdC1wcmV2aWV3KTo6YmVmb3JlIHsKQEAgLTY3LDcg KzcwLDYgQEAKIAogLm9iamVjdC10cmVlLmV4cGFuZGVkID4gLm9iamVjdC10cmVlLW91dGxpbmUg ewogICAgIGRpc3BsYXk6IGJsb2NrOwotICAgIHBhZGRpbmctbGVmdDogMTZweDsKIH0KIAogLm9i amVjdC10cmVlLW91dGxpbmUgewpAQCAtMTAzLDEwICsxMDUsMyBAQAogICAgIGZvbnQtZmFtaWx5 OiBzYW5zLXNlcmlmOwogICAgIGZvbnQtc2l6ZTogMTJweDsKIH0KLQotLyogQ29uc29sZSBPdmVy cmlkZXMgKi8KLQotOm1hdGNoZXMoLmZvcm1hdHRlZC1vYmplY3QsIC5mb3JtYXR0ZWQtbm9kZSwg LmZvcm1hdHRlZC1lcnJvciwgLmZvcm1hdHRlZC1tYXAsIC5mb3JtYXR0ZWQtc2V0LCAuZm9ybWF0 dGVkLXdlYWttYXApIC5vYmplY3QtdHJlZS1vdXRsaW5lLAotOm1hdGNoZXMoLmNvbnNvbGUtZm9y bWF0dGVkLW9iamVjdCwgLmNvbnNvbGUtZm9ybWF0dGVkLW5vZGUsIC5jb25zb2xlLWZvcm1hdHRl ZC1lcnJvciwgLmNvbnNvbGUtZm9ybWF0dGVkLW1hcCwgLmNvbnNvbGUtZm9ybWF0dGVkLXNldCwg LmNvbnNvbGUtZm9ybWF0dGVkLXdlYWttYXApIC5vYmplY3QtdHJlZS1vdXRsaW5lIHsKLSAgICBw YWRkaW5nLWxlZnQ6IDZweCAhaW1wb3J0YW50OwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVk aXRvci5qcwppbmRleCBmNDgwNDIzLi43Y2VkMDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4 dEVkaXRvci5qcwpAQCAtMTM1Miw3ICsxMzUyLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVU ZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgICAgIHZhciB3cmFwcGVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAg ICAgICAgICB3cmFwcGVyLmNsYXNzTmFtZSA9ICJib2R5IGNvbnNvbGUtZm9ybWF0dGVkLWZ1bmN0 aW9uIjsKKyAgICAgICAgICAgIHdyYXBwZXIuY2xhc3NOYW1lID0gImJvZHkgZm9ybWF0dGVkLWZ1 bmN0aW9uIjsKICAgICAgICAgICAgIHdyYXBwZXIudGV4dENvbnRlbnQgPSBkYXRhLmRlc2NyaXB0 aW9uOwogCiAgICAgICAgICAgICB2YXIgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwpAQCAtMTM5NSw3ICsxMzk1LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0 RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICBfc2hvd1BvcG92ZXJGb3JTdHJpbmc6IGZ1bmN0aW9u KGRhdGEpCiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwotICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJzdHJpbmcgY29uc29sZS1m b3JtYXR0ZWQtc3RyaW5nIjsKKyAgICAgICAgY29udGVudC5jbGFzc05hbWUgPSAic3RyaW5nIGZv cm1hdHRlZC1zdHJpbmciOwogICAgICAgICBjb250ZW50LnRleHRDb250ZW50ID0gIlwiIiArIGRh dGEuZGVzY3JpcHRpb24gKyAiXCIiOwogCiAgICAgICAgIHRoaXMuX3Nob3dQb3BvdmVyKGNvbnRl bnQpOwpAQCAtMTQwNCw3ICsxNDA0LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRp dG9yLnByb3RvdHlwZSA9IHsKICAgICBfc2hvd1BvcG92ZXJGb3JSZWdFeHA6IGZ1bmN0aW9uKGRh dGEpCiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJyZWdleHAgY29uc29sZS1mb3Jt YXR0ZWQtcmVnZXhwIjsKKyAgICAgICAgY29udGVudC5jbGFzc05hbWUgPSAicmVnZXhwIGZvcm1h dHRlZC1yZWdleHAiOwogICAgICAgICBjb250ZW50LnRleHRDb250ZW50ID0gZGF0YS5kZXNjcmlw dGlvbjsKIAogICAgICAgICB0aGlzLl9zaG93UG9wb3Zlcihjb250ZW50KTsKQEAgLTE0MTMsNyAr MTQxMyw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7 CiAgICAgX3Nob3dQb3BvdmVyRm9yTnVtYmVyOiBmdW5jdGlvbihkYXRhKQogICAgIHsKICAgICAg ICAgdmFyIGNvbnRlbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAg IGNvbnRlbnQuY2xhc3NOYW1lID0gIm51bWJlciBjb25zb2xlLWZvcm1hdHRlZC1udW1iZXIiOwor ICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJudW1iZXIgZm9ybWF0dGVkLW51bWJlciI7CiAg ICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSBkYXRhLmRlc2NyaXB0aW9uOwogCiAgICAgICAg IHRoaXMuX3Nob3dQb3BvdmVyKGNvbnRlbnQpOwpAQCAtMTQyMiw3ICsxNDIyLDcgQEAgV2ViSW5z cGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICBfc2hvd1BvcG92 ZXJGb3JCb29sZWFuOiBmdW5jdGlvbihkYXRhKQogICAgIHsKICAgICAgICAgdmFyIGNvbnRlbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIGNvbnRlbnQuY2xhc3NO YW1lID0gImJvb2xlYW4gY29uc29sZS1mb3JtYXR0ZWQtYm9vbGVhbiI7CisgICAgICAgIGNvbnRl bnQuY2xhc3NOYW1lID0gImJvb2xlYW4gZm9ybWF0dGVkLWJvb2xlYW4iOwogICAgICAgICBjb250 ZW50LnRleHRDb250ZW50ID0gZGF0YS5kZXNjcmlwdGlvbjsKIAogICAgICAgICB0aGlzLl9zaG93 UG9wb3Zlcihjb250ZW50KTsKQEAgLTE0MzEsNyArMTQzMSw3IEBAIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgX3Nob3dQb3BvdmVyRm9yTnVsbDog ZnVuY3Rpb24oZGF0YSkKICAgICB7CiAgICAgICAgIHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJib29sZWFu IGNvbnNvbGUtZm9ybWF0dGVkLW51bGwiOworICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJi b29sZWFuIGZvcm1hdHRlZC1udWxsIjsKICAgICAgICAgY29udGVudC50ZXh0Q29udGVudCA9IGRh dGEuZGVzY3JpcHRpb247CiAKICAgICAgICAgdGhpcy5fc2hvd1BvcG92ZXIoY29udGVudCk7CkBA IC0xNDQwLDcgKzE0NDAsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJv dG90eXBlID0gewogICAgIF9zaG93UG9wb3ZlckZvclVuZGVmaW5lZDogZnVuY3Rpb24oZGF0YSkK ICAgICB7CiAgICAgICAgIHZhciBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3Bh biIpOwotICAgICAgICBjb250ZW50LmNsYXNzTmFtZSA9ICJib29sZWFuIGNvbnNvbGUtZm9ybWF0 dGVkLXVuZGVmaW5lZCI7CisgICAgICAgIGNvbnRlbnQuY2xhc3NOYW1lID0gImJvb2xlYW4gZm9y bWF0dGVkLXVuZGVmaW5lZCI7CiAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSBkYXRhLmRl c2NyaXB0aW9uOwogCiAgICAgICAgIHRoaXMuX3Nob3dQb3BvdmVyKGNvbnRlbnQpOwo=