145297 2015-05-21 22:54:27 -0700 build.webkit.org/dashboard: Simplify BuildbotQueueView creation code 2015-05-22 12:04:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap dburkart thorton timothy oldest_to_newest 1096784 0 ap 2015-05-21 22:54:27 -0700 Currently, caller has to split queues into debug and release subtypes before creating any queue. This doesn't make sense, because it's a presentation decision that should be left to views, and they don't necessarily divide queues by this parameter. 1096785 1 253577 ap 2015-05-21 22:58:58 -0700 Created attachment 253577 proposed patch 1096900 2 253577 thorton 2015-05-22 11:30:08 -0700 Comment on attachment 253577 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=253577&action=review > Tools/ChangeLog:10 > + It is up to the view to decide how to present the queues, and whether to split double space 1096913 3 ap 2015-05-22 12:04:22 -0700 Committed <http://trac.webkit.org/r184784>. 253577 2015-05-21 22:58:58 -0700 2015-05-22 11:30:08 -0700 proposed patch DebugReleaseQueues.txt text/plain 12894 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NDc1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE1LTA1LTIxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIGJ1aWxkLndlYmtpdC5vcmcvZGFzaGJvYXJkOiBTaW1wbGlmeSBCdWlsZGJv dFF1ZXVlVmlldyBjcmVhdGlvbiBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDUyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgcmVmYWN0b3JpbmcgdG8gc2ltcGxpZnkgY29kZSwg YW5kIHRvIG1ha2UgaXQgbW9yZSBsb2dpY2FsLgorCisgICAgICAgIEl0IGlzIHVwIHRvIHRoZSB2 aWV3ICB0byBkZWNpZGUgaG93IHRvIHByZXNlbnQgdGhlIHF1ZXVlcywgYW5kIHdoZXRoZXIgdG8g c3BsaXQKKyAgICAgICAgdGhlbSBpbnRvIGRlYnVnIGFuZCByZWxlYXNlLCBvciBpbiBzb21lIGRp ZmZlcmVudCB3YXkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdEJ1aWxkZXJR dWV1ZVZpZXcuanM6CisgICAgICAgIChCdWlsZGJvdEJ1aWxkZXJRdWV1ZVZpZXcuZmlsdGVyUXVl dWVzKToKKyAgICAgICAgKEJ1aWxkYm90QnVpbGRlclF1ZXVlVmlldyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJv YXJkL1NjcmlwdHMvQnVpbGRib3RMZWFrc1F1ZXVlVmlldy5qczoKKyAgICAgICAgKEJ1aWxkYm90 TGVha3NRdWV1ZVZpZXcpOgorICAgICAgICAoQnVpbGRib3RMZWFrc1F1ZXVlVmlldy5wcm90b3R5 cGUudXBkYXRlKToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFBlcmZvcm1hbmNl UXVldWVWaWV3LmpzOgorICAgICAgICAoQnVpbGRib3RQZXJmb3JtYW5jZVF1ZXVlVmlldyk6Cisg ICAgICAgIChCdWlsZGJvdFBlcmZvcm1hbmNlUXVldWVWaWV3LnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzOgorICAgICAgICAo QnVpbGRib3RRdWV1ZVZpZXcpOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBl Ll91cGRhdGVRdWV1ZXMpOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90VGVzdGVy UXVldWVWaWV3LmpzOgorICAgICAgICAoQnVpbGRib3RUZXN0ZXJRdWV1ZVZpZXcpOgorICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1s L2Rhc2hib2FyZC9TY3JpcHRzL01haW4uanM6CisgICAgICAgIChkb2N1bWVudFJlYWR5KToKKwog MjAxNS0wNS0yMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtFRkxdIEJ1bXAgbGlic291cCB2ZXJzaW9uIHRvIDIuNTAuMApJbmRleDogVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJv YXJkL1NjcmlwdHMvQnVpbGRib3RCdWlsZGVyUXVldWVWaWV3LmpzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1s L2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90QnVpbGRlclF1ZXVlVmlldy5qcwkocmV2aXNpb24g MTg0NDI0KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RCdWlsZGVyUXVldWVWaWV3 LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMywyNSArMjMsMjUgQEAKICAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1CdWlsZGJvdEJ1aWxkZXJRdWV1ZVZpZXcgPSBmdW5j dGlvbihkZWJ1Z1F1ZXVlcywgcmVsZWFzZVF1ZXVlcykKK0J1aWxkYm90QnVpbGRlclF1ZXVlVmll dyA9IGZ1bmN0aW9uKHF1ZXVlcykKIHsKLSAgICBCdWlsZGJvdFF1ZXVlVmlldy5jYWxsKHRoaXMs IGRlYnVnUXVldWVzLCByZWxlYXNlUXVldWVzKTsKKyAgICBCdWlsZGJvdFF1ZXVlVmlldy5jYWxs KHRoaXMsIHF1ZXVlcyk7CiAKLSAgICBmdW5jdGlvbiBmaWx0ZXJRdWV1ZXNCeUFyY2hpdGVjdHVy ZShhcmNoaXRlY3R1cmUsIHF1ZXVlKQorICAgIGZ1bmN0aW9uIGZpbHRlclF1ZXVlcyhhcmNoaXRl Y3R1cmUsIGRlYnVnLCBxdWV1ZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBxdWV1ZS5hcmNoaXRl Y3R1cmUgPT09IGFyY2hpdGVjdHVyZTsKKyAgICAgICAgcmV0dXJuIHF1ZXVlLmFyY2hpdGVjdHVy ZSA9PT0gYXJjaGl0ZWN0dXJlICYmIHF1ZXVlLmRlYnVnID09PSBkZWJ1ZzsKICAgICB9CiAKLSAg ICB0aGlzLnVuaXZlcnNhbFJlbGVhc2VRdWV1ZXMgPSB0aGlzLnJlbGVhc2VRdWV1ZXMuZmlsdGVy KGZpbHRlclF1ZXVlc0J5QXJjaGl0ZWN0dXJlLmJpbmQodGhpcywgQnVpbGRib3QuQnVpbGRBcmNo aXRlY3R1cmUuVW5pdmVyc2FsKSk7Ci0gICAgdGhpcy5zaXh0eUZvdXJCaXRSZWxlYXNlUXVldWVz ID0gdGhpcy5yZWxlYXNlUXVldWVzLmZpbHRlcihmaWx0ZXJRdWV1ZXNCeUFyY2hpdGVjdHVyZS5i aW5kKHRoaXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0dXJlLlNpeHR5Rm91ckJpdCkpOwotICAg IHRoaXMudGhpcnR5VHdvQml0UmVsZWFzZVF1ZXVlcyA9IHRoaXMucmVsZWFzZVF1ZXVlcy5maWx0 ZXIoZmlsdGVyUXVldWVzQnlBcmNoaXRlY3R1cmUuYmluZCh0aGlzLCBCdWlsZGJvdC5CdWlsZEFy Y2hpdGVjdHVyZS5UaGlydHlUd29CaXQpKTsKLQotICAgIHRoaXMudW5pdmVyc2FsRGVidWdRdWV1 ZXMgPSB0aGlzLmRlYnVnUXVldWVzLmZpbHRlcihmaWx0ZXJRdWV1ZXNCeUFyY2hpdGVjdHVyZS5i aW5kKHRoaXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0dXJlLlVuaXZlcnNhbCkpOwotICAgIHRo aXMuc2l4dHlGb3VyQml0RGVidWdRdWV1ZXMgPSB0aGlzLmRlYnVnUXVldWVzLmZpbHRlcihmaWx0 ZXJRdWV1ZXNCeUFyY2hpdGVjdHVyZS5iaW5kKHRoaXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0 dXJlLlNpeHR5Rm91ckJpdCkpOwotICAgIHRoaXMudGhpcnR5VHdvQml0RGVidWdRdWV1ZXMgPSB0 aGlzLmRlYnVnUXVldWVzLmZpbHRlcihmaWx0ZXJRdWV1ZXNCeUFyY2hpdGVjdHVyZS5iaW5kKHRo aXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0dXJlLlRoaXJ0eVR3b0JpdCkpOworICAgIHRoaXMu dW5pdmVyc2FsUmVsZWFzZVF1ZXVlcyA9IHRoaXMucXVldWVzLmZpbHRlcihmaWx0ZXJRdWV1ZXMu YmluZCh0aGlzLCBCdWlsZGJvdC5CdWlsZEFyY2hpdGVjdHVyZS5Vbml2ZXJzYWwsIGZhbHNlKSk7 CisgICAgdGhpcy5zaXh0eUZvdXJCaXRSZWxlYXNlUXVldWVzID0gdGhpcy5xdWV1ZXMuZmlsdGVy KGZpbHRlclF1ZXVlcy5iaW5kKHRoaXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0dXJlLlNpeHR5 Rm91ckJpdCwgZmFsc2UpKTsKKyAgICB0aGlzLnRoaXJ0eVR3b0JpdFJlbGVhc2VRdWV1ZXMgPSB0 aGlzLnF1ZXVlcy5maWx0ZXIoZmlsdGVyUXVldWVzLmJpbmQodGhpcywgQnVpbGRib3QuQnVpbGRB cmNoaXRlY3R1cmUuVGhpcnR5VHdvQml0LCBmYWxzZSkpOworCisgICAgdGhpcy51bml2ZXJzYWxE ZWJ1Z1F1ZXVlcyA9IHRoaXMucXVldWVzLmZpbHRlcihmaWx0ZXJRdWV1ZXMuYmluZCh0aGlzLCBC dWlsZGJvdC5CdWlsZEFyY2hpdGVjdHVyZS5Vbml2ZXJzYWwsIHRydWUpKTsKKyAgICB0aGlzLnNp eHR5Rm91ckJpdERlYnVnUXVldWVzID0gdGhpcy5xdWV1ZXMuZmlsdGVyKGZpbHRlclF1ZXVlcy5i aW5kKHRoaXMsIEJ1aWxkYm90LkJ1aWxkQXJjaGl0ZWN0dXJlLlNpeHR5Rm91ckJpdCwgdHJ1ZSkp OworICAgIHRoaXMudGhpcnR5VHdvQml0RGVidWdRdWV1ZXMgPSB0aGlzLnF1ZXVlcy5maWx0ZXIo ZmlsdGVyUXVldWVzLmJpbmQodGhpcywgQnVpbGRib3QuQnVpbGRBcmNoaXRlY3R1cmUuVGhpcnR5 VHdvQml0LCB0cnVlKSk7CiAKLSAgICB0aGlzLmhhc011bHRpcGxlUmVsZWFzZUJ1aWxkcyA9IHRo aXMucmVsZWFzZVF1ZXVlcy5sZW5ndGggPiAxOwotICAgIHRoaXMuaGFzTXVsdGlwbGVEZWJ1Z0J1 aWxkcyA9IHRoaXMuZGVidWdRdWV1ZXMubGVuZ3RoID4gMTsKKyAgICB0aGlzLmhhc011bHRpcGxl UmVsZWFzZUJ1aWxkcyA9IHRoaXMudW5pdmVyc2FsUmVsZWFzZVF1ZXVlcy5sZW5ndGggKyB0aGlz LnNpeHR5Rm91ckJpdFJlbGVhc2VRdWV1ZXMubGVuZ3RoICsgdGhpcy50aGlydHlUd29CaXRSZWxl YXNlUXVldWVzLmxlbmd0aCA+IDE7CisgICAgdGhpcy5oYXNNdWx0aXBsZURlYnVnQnVpbGRzID0g dGhpcy51bml2ZXJzYWxEZWJ1Z1F1ZXVlcy5sZW5ndGggKyB0aGlzLnNpeHR5Rm91ckJpdERlYnVn UXVldWVzLmxlbmd0aCArIHRoaXMudGhpcnR5VHdvQml0RGVidWdRdWV1ZXMubGVuZ3RoID4gMTsK IAogICAgIHRoaXMudXBkYXRlKCk7CiB9OwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVp bGRib3RMZWFrc1F1ZXVlVmlldy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0 cy9CdWlsZGJvdExlYWtzUXVldWVWaWV3LmpzCShyZXZpc2lvbiAxODQ0MjQpCisrKyBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNo Ym9hcmQvU2NyaXB0cy9CdWlsZGJvdExlYWtzUXVldWVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBA IC0yNSw3ICsyNSw3IEBACiAKIEJ1aWxkYm90TGVha3NRdWV1ZVZpZXcgPSBmdW5jdGlvbihxdWV1 ZXMpCiB7Ci0gICAgQnVpbGRib3RRdWV1ZVZpZXcuY2FsbCh0aGlzLCBbXSwgcXVldWVzKTsKKyAg ICBCdWlsZGJvdFF1ZXVlVmlldy5jYWxsKHRoaXMsIHF1ZXVlcyk7CiAgICAgdGhpcy51cGRhdGUo KTsKIH07CiAKQEAgLTg0LDcgKzg0LDcgQEAgQnVpbGRib3RMZWFrc1F1ZXVlVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICBuZXcgUG9wb3ZlclRyYWNrZXIoc3RhdHVzLnN0YXR1c0J1YmJs ZUVsZW1lbnQsIHRoaXMuX3ByZXNlbnRQb3BvdmVyRm9yTGVha3NRdWV1ZS5iaW5kKHRoaXMpLCBp dGVyYXRpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5hcHBlbmRCdWlsZFN0eWxlLmNh bGwodGhpcywgdGhpcy5yZWxlYXNlUXVldWVzLCAiTGVha3MiLCBhcHBlbmRMZWFrc1F1ZXVlU3Rh dHVzKTsKKyAgICAgICAgdGhpcy5hcHBlbmRCdWlsZFN0eWxlLmNhbGwodGhpcywgdGhpcy5xdWV1 ZXMsICJMZWFrcyIsIGFwcGVuZExlYWtzUXVldWVTdGF0dXMpOwogICAgIH0sCiAKICAgICBhZGRM aW5rVG9Sb3c6IGZ1bmN0aW9uKHJvd0VsZW1lbnQsIGNsYXNzTmFtZSwgdGV4dCwgdXJsKQpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RQZXJmb3JtYW5jZVF1ZXVlVmlldy5qcwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFBlcmZvcm1hbmNlUXVl dWVWaWV3LmpzCShyZXZpc2lvbiAxODQ0MjQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdFBlcmZvcm1hbmNlUXVldWVWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw3ICsyNSw3 IEBACiAKIEJ1aWxkYm90UGVyZm9ybWFuY2VRdWV1ZVZpZXcgPSBmdW5jdGlvbihxdWV1ZXMpCiB7 Ci0gICAgQnVpbGRib3RRdWV1ZVZpZXcuY2FsbCh0aGlzLCBbXSwgcXVldWVzKTsKKyAgICBCdWls ZGJvdFF1ZXVlVmlldy5jYWxsKHRoaXMsIHF1ZXVlcyk7CiAgICAgdGhpcy51cGRhdGUoKTsKIH07 CiAKQEAgLTgyLDcgKzgyLDcgQEAgQnVpbGRib3RQZXJmb3JtYW5jZVF1ZXVlVmlldy5wcm90b3R5 cGUgPQogICAgICAgICAgICAgbmV3IFBvcG92ZXJUcmFja2VyKHN0YXR1cy5zdGF0dXNCdWJibGVF bGVtZW50LCB0aGlzLl9wcmVzZW50UG9wb3ZlckZvclBlcmZvcm1hbmNlUXVldWUuYmluZCh0aGlz KSwgcXVldWUpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5hcHBlbmRCdWlsZFN0eWxlLmNh bGwodGhpcywgdGhpcy5yZWxlYXNlUXVldWVzLCAnUmVsZWFzZScsIGFwcGVuZFBlcmZvcm1hbmNl UXVldWVTdGF0dXMpOworICAgICAgICB0aGlzLmFwcGVuZEJ1aWxkU3R5bGUuY2FsbCh0aGlzLCB0 aGlzLnF1ZXVlcywgJ1JlbGVhc2UnLCBhcHBlbmRQZXJmb3JtYW5jZVF1ZXVlU3RhdHVzKTsKICAg ICB9LAogCiAgICAgYWRkTGlua1RvUm93OiBmdW5jdGlvbihyb3dFbGVtZW50LCBjbGFzc05hbWUs IHRleHQsIHVybCkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3 LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3 LmpzCShyZXZpc2lvbiAxODQ0MjQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1 ZXVlVmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtMjMsMjMgKzIzLDEzIEBACiAgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotQnVpbGRib3RRdWV1ZVZpZXcgPSBmdW5j dGlvbihkZWJ1Z1F1ZXVlcywgcmVsZWFzZVF1ZXVlcykKK0J1aWxkYm90UXVldWVWaWV3ID0gZnVu Y3Rpb24ocXVldWVzKQogewogICAgIFF1ZXVlVmlldy5jYWxsKHRoaXMpOwogCi0gICAgdGhpcy5y ZWxlYXNlUXVldWVzID0gcmVsZWFzZVF1ZXVlcyB8fCBbXTsKLSAgICB0aGlzLmRlYnVnUXVldWVz ID0gZGVidWdRdWV1ZXMgfHwgW107CisgICAgdGhpcy5xdWV1ZXMgPSBxdWV1ZXMgfHwgW107CiAK LSAgICB0aGlzLnJlbGVhc2VRdWV1ZXMuZm9yRWFjaChmdW5jdGlvbihxdWV1ZSkgewotICAgICAg ICBpZiAodGhpcy5wbGF0Zm9ybSAmJiB0aGlzLnBsYXRmb3JtICE9IHF1ZXVlLnBsYXRmb3JtKQot ICAgICAgICAgICAgdGhyb3cgIkEgYnVpbGRib3QgdmlldyBtYXkgbm90IGNvbnRhaW4gcXVldWVz IGZvciBtdWx0aXBsZSBwbGF0Zm9ybXMuIgotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlz LnBsYXRmb3JtID0gcXVldWUucGxhdGZvcm07Ci0gICAgICAgIHF1ZXVlLmFkZEV2ZW50TGlzdGVu ZXIoQnVpbGRib3RRdWV1ZS5FdmVudC5JdGVyYXRpb25zQWRkZWQsIHRoaXMuX3F1ZXVlSXRlcmF0 aW9uc0FkZGVkLCB0aGlzKTsKLSAgICAgICAgcXVldWUuYWRkRXZlbnRMaXN0ZW5lcihCdWlsZGJv dFF1ZXVlLkV2ZW50LlVuYXV0aG9yaXplZEFjY2VzcywgdGhpcy5fdW5hdXRob3JpemVkQWNjZXNz LCB0aGlzKTsKLSAgICB9LmJpbmQodGhpcykpOwotCi0gICAgdGhpcy5kZWJ1Z1F1ZXVlcy5mb3JF YWNoKGZ1bmN0aW9uKHF1ZXVlKSB7CisgICAgdGhpcy5xdWV1ZXMuZm9yRWFjaChmdW5jdGlvbihx dWV1ZSkgewogICAgICAgICBpZiAodGhpcy5wbGF0Zm9ybSAmJiB0aGlzLnBsYXRmb3JtICE9IHF1 ZXVlLnBsYXRmb3JtKQogICAgICAgICAgICAgdGhyb3cgIkEgYnVpbGRib3QgdmlldyBtYXkgbm90 IGNvbnRhaW4gcXVldWVzIGZvciBtdWx0aXBsZSBwbGF0Zm9ybXMuIgogICAgICAgICBlbHNlCkBA IC0zMDIsOCArMjkyLDcgQEAgQnVpbGRib3RRdWV1ZVZpZXcucHJvdG90eXBlID0gewogCiAgICAg X3VwZGF0ZVF1ZXVlczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5yZWxlYXNlUXVl dWVzLmZvckVhY2goZnVuY3Rpb24ocXVldWUpIHsgcXVldWUudXBkYXRlKCk7IH0pOwotICAgICAg ICB0aGlzLmRlYnVnUXVldWVzLmZvckVhY2goZnVuY3Rpb24ocXVldWUpIHsgcXVldWUudXBkYXRl KCk7IH0pOworICAgICAgICB0aGlzLnF1ZXVlcy5mb3JFYWNoKGZ1bmN0aW9uKHF1ZXVlKSB7IHF1 ZXVlLnVwZGF0ZSgpOyB9KTsKICAgICB9LAogCiAgICAgX3F1ZXVlSXRlcmF0aW9uc0FkZGVkOiBm dW5jdGlvbihldmVudCkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90VGVzdGVy UXVldWVWaWV3LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90 VGVzdGVyUXVldWVWaWV3LmpzCShyZXZpc2lvbiAxODQ0MjQpCisrKyBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9CdWlsZGJvdFRlc3RlclF1ZXVlVmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtMjMsOSAr MjMsMTIgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1CdWls ZGJvdFRlc3RlclF1ZXVlVmlldyA9IGZ1bmN0aW9uKGRlYnVnUXVldWVzLCByZWxlYXNlUXVldWVz KQorQnVpbGRib3RUZXN0ZXJRdWV1ZVZpZXcgPSBmdW5jdGlvbihxdWV1ZXMpCiB7Ci0gICAgQnVp bGRib3RRdWV1ZVZpZXcuY2FsbCh0aGlzLCBkZWJ1Z1F1ZXVlcywgcmVsZWFzZVF1ZXVlcyk7Cisg ICAgQnVpbGRib3RRdWV1ZVZpZXcuY2FsbCh0aGlzLCBxdWV1ZXMpOworCisgICAgdGhpcy5yZWxl YXNlUXVldWVzID0gdGhpcy5xdWV1ZXMuZmlsdGVyKGZ1bmN0aW9uKHF1ZXVlKSB7IHJldHVybiBx dWV1ZS5kZWJ1ZyA9PT0gZmFsc2U7IH0pOworICAgIHRoaXMuZGVidWdRdWV1ZXMgPSB0aGlzLnF1 ZXVlcy5maWx0ZXIoZnVuY3Rpb24ocXVldWUpIHsgcmV0dXJuIHF1ZXVlLmRlYnVnID09PSB0cnVl OyB9KTsKIAogICAgIHRoaXMudXBkYXRlKCk7CiB9OwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvTWFpbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWluLmpzCShy ZXZpc2lvbiAxODQ0MjQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9NYWluLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0zNiw3ICszNiw3IEBAIGZvciAodmFyIGkgPSAwOyBpIDwgYnVpbGRib3RzLmxl bmd0aDsgKysKICAgICAgICAgaWYgKCFwbGF0Zm9ybSkKICAgICAgICAgICAgIHBsYXRmb3JtID0g Y2F0ZWdvcml6ZWRRdWV1ZXNCeVBsYXRmb3JtQW5kQnVpbGRUeXBlW3F1ZXVlLnBsYXRmb3JtXSA9 IHt9OwogICAgICAgICBpZiAoIXBsYXRmb3JtLmJ1aWxkZXJzKQotICAgICAgICAgICAgcGxhdGZv cm0uYnVpbGRlcnMgPSB7fTsKKyAgICAgICAgICAgIHBsYXRmb3JtLmJ1aWxkZXJzID0gW107CiAK ICAgICAgICAgdmFyIGNhdGVnb3J5TmFtZTsKICAgICAgICAgaWYgKHF1ZXVlLmJ1aWxkZXIpCkBA IC01NCwxNSArNTQsOSBAQCBmb3IgKHZhciBpID0gMDsgaSA8IGJ1aWxkYm90cy5sZW5ndGg7ICsr CiAKICAgICAgICAgY2F0ZWdvcnkgPSBwbGF0Zm9ybVtjYXRlZ29yeU5hbWVdOwogICAgICAgICBp ZiAoIWNhdGVnb3J5KQotICAgICAgICAgICAgY2F0ZWdvcnkgPSBwbGF0Zm9ybVtjYXRlZ29yeU5h bWVdID0ge307CisgICAgICAgICAgICBjYXRlZ29yeSA9IHBsYXRmb3JtW2NhdGVnb3J5TmFtZV0g PSBbXTsKIAotICAgICAgICB2YXIgYnVpbGRUeXBlID0gcXVldWUuZGVidWcgPyAiZGVidWciIDog InJlbGVhc2UiOwotCi0gICAgICAgIGJ1aWxkUXVldWVzID0gY2F0ZWdvcnlbYnVpbGRUeXBlXTsK LSAgICAgICAgaWYgKCFidWlsZFF1ZXVlcykKLSAgICAgICAgICAgIGJ1aWxkUXVldWVzID0gY2F0 ZWdvcnlbYnVpbGRUeXBlXSA9IFtdOwotCi0gICAgICAgIGJ1aWxkUXVldWVzLnB1c2gocXVldWUp OworICAgICAgICBjYXRlZ29yeS5wdXNoKHF1ZXVlKTsKICAgICB9CiB9CiAKQEAgLTczLDcgKzY3 LDcgQEAgaWYgKGhhc0J1YmJsZXMpIHsKICAgICAgICAgaWYgKCFwbGF0Zm9ybSkKICAgICAgICAg ICAgIHBsYXRmb3JtID0gY2F0ZWdvcml6ZWRRdWV1ZXNCeVBsYXRmb3JtQW5kQnVpbGRUeXBlW3F1 ZXVlLnBsYXRmb3JtXSA9IHt9OwogICAgICAgICBpZiAoIXBsYXRmb3JtLmJ1aWxkZXJzKQotICAg ICAgICAgICAgcGxhdGZvcm0uYnVpbGRlcnMgPSB7fTsKKyAgICAgICAgICAgIHBsYXRmb3JtLmJ1 aWxkZXJzID0gW107CiAKICAgICAgICAgdmFyIGNhdGVnb3J5TmFtZSA9IEJ1YmJsZXNDYXRlZ29y eTsKIApAQCAtMTk5LDcgKzE5Myw3IEBAIGZ1bmN0aW9uIGRvY3VtZW50UmVhZHkoKQogCiAgICAg ICAgIGNlbGwgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ0ZCIpOwogCi0gICAgICAgIHZhciB2 aWV3ID0gbmV3IEJ1aWxkYm90QnVpbGRlclF1ZXVlVmlldyhwbGF0Zm9ybVF1ZXVlcy5idWlsZGVy cy5kZWJ1ZywgcGxhdGZvcm1RdWV1ZXMuYnVpbGRlcnMucmVsZWFzZSk7CisgICAgICAgIHZhciB2 aWV3ID0gbmV3IEJ1aWxkYm90QnVpbGRlclF1ZXVlVmlldyhwbGF0Zm9ybVF1ZXVlcy5idWlsZGVy cyk7CiAgICAgICAgIGNlbGwuYXBwZW5kQ2hpbGQodmlldy5lbGVtZW50KTsKICAgICAgICAgcm93 LmFwcGVuZENoaWxkKGNlbGwpOwogCkBAIC0yMDgsNyArMjAyLDcgQEAgZnVuY3Rpb24gZG9jdW1l bnRSZWFkeSgpCiAKICAgICAgICAgICAgIHZhciB0ZXN0ZXJQcm9wZXJ0eSA9IEJ1aWxkYm90LlRl c3RDYXRlZ29yeVt0ZXN0ZXJLZXldOwogICAgICAgICAgICAgaWYgKHBsYXRmb3JtUXVldWVzW3Rl c3RlclByb3BlcnR5XSkgewotICAgICAgICAgICAgICAgIHZhciB2aWV3ID0gbmV3IEJ1aWxkYm90 VGVzdGVyUXVldWVWaWV3KHBsYXRmb3JtUXVldWVzW3Rlc3RlclByb3BlcnR5XS5kZWJ1ZywgcGxh dGZvcm1RdWV1ZXNbdGVzdGVyUHJvcGVydHldLnJlbGVhc2UpOworICAgICAgICAgICAgICAgIHZh ciB2aWV3ID0gbmV3IEJ1aWxkYm90VGVzdGVyUXVldWVWaWV3KHBsYXRmb3JtUXVldWVzW3Rlc3Rl clByb3BlcnR5XSk7CiAgICAgICAgICAgICAgICAgY2VsbC5hcHBlbmRDaGlsZCh2aWV3LmVsZW1l bnQpOwogICAgICAgICAgICAgfQogCkBAIC0yMTYsMTMgKzIxMCwxMyBAQCBmdW5jdGlvbiBkb2N1 bWVudFJlYWR5KCkKICAgICAgICAgfQogCiAgICAgICAgIHZhciBjZWxsID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgidGQiKTsKLSAgICAgICAgaWYgKHBsYXRmb3JtUXVldWVzLnBlcmZvcm1hbmNl ICYmIHBsYXRmb3JtUXVldWVzLnBlcmZvcm1hbmNlLnJlbGVhc2UpIHsKLSAgICAgICAgICAgIHZh ciB2aWV3ID0gbmV3IEJ1aWxkYm90UGVyZm9ybWFuY2VRdWV1ZVZpZXcocGxhdGZvcm1RdWV1ZXMu cGVyZm9ybWFuY2UucmVsZWFzZSk7CisgICAgICAgIGlmIChwbGF0Zm9ybVF1ZXVlcy5wZXJmb3Jt YW5jZSkgeworICAgICAgICAgICAgdmFyIHZpZXcgPSBuZXcgQnVpbGRib3RQZXJmb3JtYW5jZVF1 ZXVlVmlldyhwbGF0Zm9ybVF1ZXVlcy5wZXJmb3JtYW5jZSk7CiAgICAgICAgICAgICBjZWxsLmFw cGVuZENoaWxkKHZpZXcuZWxlbWVudCk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocGxhdGZv cm1RdWV1ZXMubGVha3MgJiYgcGxhdGZvcm1RdWV1ZXMubGVha3MuZGVidWcpIHsKLSAgICAgICAg ICAgIHZhciB2aWV3ID0gbmV3IEJ1aWxkYm90TGVha3NRdWV1ZVZpZXcocGxhdGZvcm1RdWV1ZXMu bGVha3MuZGVidWcpOworICAgICAgICBpZiAocGxhdGZvcm1RdWV1ZXMubGVha3MpIHsKKyAgICAg ICAgICAgIHZhciB2aWV3ID0gbmV3IEJ1aWxkYm90TGVha3NRdWV1ZVZpZXcocGxhdGZvcm1RdWV1 ZXMubGVha3MpOwogICAgICAgICAgICAgY2VsbC5hcHBlbmRDaGlsZCh2aWV3LmVsZW1lbnQpOwog ICAgICAgICB9CiAK