70721 2011-10-24 05:59:13 -0700 Web Inspector: [Styles] Adding a new style rule breaks things 2011-10-24 08:22:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 489289 0 apavlov 2011-10-24 05:59:13 -0700 1. Go to about:blank 2. Open the devtools at the 'elements' page 3. Add a new style with the 'plus' button on the right. 4. For the style target, type '#foo' 5. Press enter 6. Try to add rules to the style - double clicking in/around the body of the style does not add a new rule. As far as I can tell, there is no way to add a new rule. - pressing 'esc' no longer causes the console to disappear. Upstreaming http://code.google.com/p/chromium/issues/detail?id=101256 489320 1 112184 apavlov 2011-10-24 07:30:13 -0700 Created attachment 112184 [PATCH] Suggested fix 489325 2 112184 pfeldman 2011-10-24 07:44:56 -0700 Comment on attachment 112184 [PATCH] Suggested fix View in context: https://bugs.webkit.org/attachment.cgi?id=112184&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1358 > + get isBlank() make it a function please. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1387 > + if (this.isBlank) Could you move this check to the top and make it a guard? Also putting a FIXME suggesting re-creating object would be great. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1395 > + if (this.isBlank) Please convert to the guard. 489338 3 112188 apavlov 2011-10-24 08:19:05 -0700 Created attachment 112188 [PATCH] Comments addressed Impossible to convert isBlank into function - requires defining same-named method on all style sections. 489339 4 apavlov 2011-10-24 08:22:35 -0700 Committed r98243: <http://trac.webkit.org/changeset/98243> 112184 2011-10-24 07:30:13 -0700 2011-10-24 08:19:05 -0700 [PATCH] Suggested fix styleadd.patch text/plain 8705 apavlov Y29tbWl0IGRkNDEzMGU1ZGMxMWVhNmRkODdjOTQzZDk1YmI2YzQxNDBlNDc5YTEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBNb24gT2N0IDI0 IDE2OjU5OjU3IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjVjZmUyNC4uNzBhYmFlZCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTEwLTI0ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1N0eWxlc10gQWRk aW5nIGEgbmV3IHN0eWxlIHJ1bGUgYnJlYWtzIHRoaW5ncworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1u ZXctcnVsZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMt YWRkLW5ldy1ydWxlLmh0bWw6CisKIDIwMTEtMTAtMjEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2 bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdHMgaGFuZyBv biBwYWdlcyB3aXRob3V0IGltZ1tzcmNdIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtYWRkLW5ldy1ydWxlLWV4cGVjdGVkLnR4 dAppbmRleCA2MTM4MTRhLi41NzFlMDVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3Ivc3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXctcnVsZS1leHBlY3RlZC50eHQKQEAg LTEsNCArMSw0IEBACi1UZXN0cyB0aGF0IGFkZGluZyBhIG5ldyBydWxlIHdvcmtzIGFmdGVyIHNp dGNoaW5nIG5vZGVzLgorVGVzdHMgdGhhdCBhZGRpbmcgYSBuZXcgcnVsZSB3b3JrcyBhZnRlciBz d2l0Y2hpbmcgbm9kZXMuCiAKIFRleHQKIEFmdGVyIGFkZGluZyBuZXcgcnVsZSAoaW5zcGVjdGVk KToKQEAgLTcsNiArNyw3IEBAIGZvbnQtc2l6ZTogMTJweDsKIAogPT09PT09PT0gTWF0Y2hlZCBD U1MgUnVsZXMgPT09PT09PT0KIFtleHBhbmRlZF0gI2luc3BlY3RlZCB7ICh2aWEgaW5zcGVjdG9y KQorY29sb3I6IG1hcm9vbjsKIAogW2V4cGFuZGVkXSBkaXYgeyAodXNlciBhZ2VudCBzdHlsZXNo ZWV0KQogZGlzcGxheTogYmxvY2s7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv c3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvc3R5bGVzLWFkZC1uZXctcnVsZS5odG1sCmluZGV4IGQwMGFlZTYuLjE2YjNhMjggMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXctcnVs ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXct cnVsZS5odG1sCkBAIC0xMywyNSArMTMsNDAgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5j dGlvbiBzdGVwMSgpCiAgICAgewotICAgICAgICAvLyBDbGljayBhZGQgbmV3IHJ1bGUKKyAgICAg ICAgLy8gQ2xpY2sgIkFkZCBuZXcgcnVsZSIuCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJhZGQtc3R5bGUtYnV0dG9uLXRlc3QtaWQiKS5jbGljaygpOwotICAgICAgICBJbnNwZWN0 b3JUZXN0LnNlbGVjdE5vZGVBbmRXYWl0Rm9yU3R5bGVzKCJvdGhlciIsIHN0ZXAyKTsKKyAgICAg ICAgdmFyIHNlY3Rpb24gPSBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnNpZGViYXJQYW5l cy5zdHlsZXMuc2VjdGlvbnNbMF1bMl07CisgICAgICAgIHNlY3Rpb24uX3NlbGVjdG9yRWxlbWVu dC5kaXNwYXRjaEV2ZW50KEluc3BlY3RvclRlc3QuY3JlYXRlS2V5RXZlbnQoIkVudGVyIikpOwor ICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUGVuZGluZ0Rpc3BhdGNoZXMoc3RlcDIpOwog ICAgIH0KIAotICAgIGZ1bmN0aW9uIHN0ZXAyKCkgewotICAgICAgICAvLyBDbGljayBhZGQgbmV3 IHJ1bGUKLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFkZC1zdHlsZS1idXR0b24t dGVzdC1pZCIpLmNsaWNrKCk7Ci0gICAgICAgIEluc3BlY3RvclRlc3Quc2VsZWN0Tm9kZUFuZFdh aXRGb3JTdHlsZXMoImluc3BlY3RlZCIsIHN0ZXAzKTsKKyAgICBmdW5jdGlvbiBzdGVwMigpCisg ICAgeworICAgICAgICB2YXIgc2VjdGlvbiA9IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMu c2lkZWJhclBhbmVzLnN0eWxlcy5zZWN0aW9uc1swXVsyXTsKKyAgICAgICAgdmFyIG5ld1Byb3Bl cnR5ID0gc2VjdGlvbi5hZGROZXdCbGFua1Byb3BlcnR5KCk7CisgICAgICAgIG5ld1Byb3BlcnR5 LnN0YXJ0RWRpdGluZygpOworICAgICAgICBuZXdQcm9wZXJ0eS5uYW1lRWxlbWVudC50ZXh0Q29u dGVudCA9ICJjb2xvciI7CisgICAgICAgIG5ld1Byb3BlcnR5Lm5hbWVFbGVtZW50LmRpc3BhdGNo RXZlbnQoSW5zcGVjdG9yVGVzdC5jcmVhdGVLZXlFdmVudCgiRW50ZXIiKSk7CisgICAgICAgIG5l d1Byb3BlcnR5LnZhbHVlRWxlbWVudC50ZXh0Q29udGVudCA9ICJtYXJvb24iOworICAgICAgICBu ZXdQcm9wZXJ0eS52YWx1ZUVsZW1lbnQuZGlzcGF0Y2hFdmVudChJbnNwZWN0b3JUZXN0LmNyZWF0 ZUtleUV2ZW50KCJFbnRlciIpKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlQW5k V2FpdEZvclN0eWxlcygib3RoZXIiLCBzdGVwMyk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gc3Rl cDMoKQogICAgIHsKKyAgICAgICAgLy8gQ2xpY2sgIkFkZCBuZXcgcnVsZSIuCisgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJhZGQtc3R5bGUtYnV0dG9uLXRlc3QtaWQiKS5jbGljaygp OworICAgICAgICBJbnNwZWN0b3JUZXN0LnNlbGVjdE5vZGVBbmRXYWl0Rm9yU3R5bGVzKCJpbnNw ZWN0ZWQiLCBzdGVwNCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDQoKQorICAgIHsKICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVyIGFkZGluZyBuZXcgcnVsZSAoaW5z cGVjdGVkKToiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5 bGVzKHRydWUsIGZhbHNlLCB0cnVlKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2Rl QW5kV2FpdEZvclN0eWxlcygib3RoZXIiLCBzdGVwNCk7CisgICAgICAgIEluc3BlY3RvclRlc3Qu c2VsZWN0Tm9kZUFuZFdhaXRGb3JTdHlsZXMoIm90aGVyIiwgc3RlcDUpOwogICAgIH0KIAotICAg IGZ1bmN0aW9uIHN0ZXA0KCkKKyAgICBmdW5jdGlvbiBzdGVwNSgpCiAgICAgewogICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiQWZ0ZXIgYWRkaW5nIG5ldyBydWxlIChvdGhlcik6Iik7 CiAgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlLCBm YWxzZSwgdHJ1ZSk7CkBAIC00NCw3ICs1OSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiA8Ym9keSBv bmxvYWQ9InJ1blRlc3QoKSI+CiA8cD4KLVRlc3RzIHRoYXQgYWRkaW5nIGEgbmV3IHJ1bGUgd29y a3MgYWZ0ZXIgc2l0Y2hpbmcgbm9kZXMuCitUZXN0cyB0aGF0IGFkZGluZyBhIG5ldyBydWxlIHdv cmtzIGFmdGVyIHN3aXRjaGluZyBub2Rlcy4KIDwvcD4KIAogPGRpdiBpZD0iaW5zcGVjdGVkIiBz dHlsZT0iZm9udC1zaXplOiAxMnB4Ij5UZXh0PC9kaXY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEwNGNlZS4u YmMxN2NkZiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTEwLTI0ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW1N0eWxlc10gQWRkaW5nIGEgbmV3IHN0eWxlIHJ1bGUgYnJlYWtzIHRoaW5ncworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBoYWQgdXNlZCB0byBz d2FwIEJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiBwcm90b3R5cGUgYW5kIHJlY2VudGx5IGdv dCByaWQgb2YgdGhpcyBoYWNrLAorICAgICAgICBidXQgc3RpbGwgaGFkIGRlcGVuZGVuY2llcyBv biB0aGUgb2xkIGJlaGF2aW9yLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFu ZS5wcm90b3R5cGUuX3JlZnJlc2hTdHlsZVJ1bGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b21wdXRlZFN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLnJlYnVpbGRDb21wdXRlZFRy YWNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24u cHJvdG90eXBlLmdldCBpc0JsYW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmV4cGFuZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JD b21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLm1ha2VOb3JtYWwp OgorCiAyMDExLTEwLTIxICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQXVkaXRzIGhhbmcgb24gcGFnZXMgd2l0aG91dCBp bWdbc3JjXSBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggNTE3OTVhYi4uMTYyZmM4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCkBAIC0zNzUsNyArMzc1LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGVi YXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHN0eWxlUnVsZXMgPSBbXTsKICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IHNlY3Rpb25zICYmIGkgPCBzZWN0aW9ucy5sZW5ndGg7ICsraSkg ewogICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBzZWN0aW9uc1tpXTsKLSAgICAgICAgICAgIGlm IChzZWN0aW9uIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbikKKyAgICAgICAgICAgIGlmIChzZWN0aW9uLmlzQmxhbmspCiAgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICBpZiAoc2VjdGlvbi5jb21wdXRlZFN0eWxlKQogICAgICAg ICAgICAgICAgIHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlID0gbm9kZUNvbXB1dGVkU3R5bGU7CkBA IC0xMzA3LDcgKzEzMDcsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZVByb3BlcnRpZXNT ZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg c2VjdGlvbnMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBzZWN0aW9uID0gc2VjdGlv bnNbaV07Ci0gICAgICAgICAgICBpZiAoc2VjdGlvbi5jb21wdXRlZFN0eWxlIHx8IHNlY3Rpb24g aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uKQorICAg ICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRTdHlsZSB8fCBzZWN0aW9uLmlzQmxhbmspCiAg ICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBq IDwgc2VjdGlvbi51bmlxdWVQcm9wZXJ0aWVzLmxlbmd0aDsgKytqKSB7CkBAIC0xMzU1LDEyICsx MzU1LDE4IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24gPSBmdW5j dGlvbihwYXJlbnRQYW5lLCBkZWZhdWx0U2VsZWN0b3JUCiB9CiAKIFdlYkluc3BlY3Rvci5CbGFu a1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0geworICAgIGdldCBpc0JsYW5rKCkK KyAgICB7CisgICAgICAgIHJldHVybiAhdGhpcy5fbm9ybWFsOworICAgIH0sCisKICAgICBleHBh bmQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIC8vIERvIG5vdGhpbmcsIGJsYW5rIHNlY3Rp b25zIGFyZSBub3QgZXhwYW5kYWJsZS4KKyAgICAgICAgaWYgKCF0aGlzLmlzQmxhbmspCisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZXhw YW5kLmNhbGwodGhpcyk7CiAgICAgfSwKIAotICAgIGVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZDog ZnVuY3Rpb24oZWxlbWVudCwgbmV3Q29udGVudCwgb2xkQ29udGVudCwgY29udGV4dCkKKyAgICBl ZGl0aW5nU2VsZWN0b3JDb21taXR0ZWQ6IGZ1bmN0aW9uKGVsZW1lbnQsIG5ld0NvbnRlbnQsIG9s ZENvbnRlbnQsIGNvbnRleHQsIG1vdmVEaXJlY3Rpb24pCiAgICAgewogICAgICAgICBmdW5jdGlv biBzdWNjZXNzQ2FsbGJhY2sobmV3UnVsZSwgZG9lc1NlbGVjdG9yQWZmZWN0U2VsZWN0ZWROb2Rl KQogICAgICAgICB7CkBAIC0xMzc0LDE2ICsxMzgwLDIyIEBAIFdlYkluc3BlY3Rvci5CbGFua1N0 eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICB0aGlzLnN1 YnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygidmlhIGlu c3BlY3RvciIpOwogICAgICAgICAgICAgdGhpcy5leHBhbmQoKTsKLSAgICAgICAgICAgIGlmICh0 aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudCkgIC8vIE1pZ2h0IGhhdmUgYmVlbiBkZXRhY2hlZCBh bHJlYWR5LgotICAgICAgICAgICAgICAgIHRoaXMuYWRkTmV3QmxhbmtQcm9wZXJ0eSgpLnN0YXJ0 RWRpdGluZygpOworICAgICAgICAgICAgaWYgKHRoaXMuZWxlbWVudC5wYXJlbnRFbGVtZW50KSAv LyBNaWdodCBoYXZlIGJlZW4gZGV0YWNoZWQgYWxyZWFkeS4KKyAgICAgICAgICAgICAgICB0aGlz Ll9tb3ZlRWRpdG9yRnJvbVNlbGVjdG9yKG1vdmVEaXJlY3Rpb24pOwogICAgICAgICB9CiAKLSAg ICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLmFkZFJ1bGUodGhpcy5wYW5lLm5vZGUuaWQsIG5l d0NvbnRlbnQsIHN1Y2Nlc3NDYWxsYmFjay5iaW5kKHRoaXMpLCB0aGlzLmVkaXRpbmdTZWxlY3Rv ckNhbmNlbGxlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgaWYgKHRoaXMuaXNCbGFuaykKKyAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5hZGRSdWxlKHRoaXMucGFuZS5ub2RlLmlkLCBu ZXdDb250ZW50LCBzdWNjZXNzQ2FsbGJhY2suYmluZCh0aGlzKSwgdGhpcy5lZGl0aW5nU2VsZWN0 b3JDYW5jZWxsZWQuYmluZCh0aGlzKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JD b21taXR0ZWQuY2FsbCh0aGlzLCBlbGVtZW50LCBuZXdDb250ZW50LCBvbGRDb250ZW50LCBjb250 ZXh0LCBtb3ZlRGlyZWN0aW9uKTsKICAgICB9LAogCiAgICAgZWRpdGluZ1NlbGVjdG9yQ2FuY2Vs bGVkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLnBhbmUucmVtb3ZlU2VjdGlvbih0 aGlzKTsKKyAgICAgICAgaWYgKHRoaXMuaXNCbGFuaykKKyAgICAgICAgICAgIHRoaXMucGFuZS5y ZW1vdmVTZWN0aW9uKHRoaXMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ2FuY2Vs bGVkLmNhbGwodGhpcyk7CiAgICAgfSwKIAogICAgIG1ha2VOb3JtYWw6IGZ1bmN0aW9uKHN0eWxl UnVsZSkKQEAgLTEzOTIsNiArMTQwNCw3IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVy dGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnN0eWxlUnVsZSA9IHN0eWxl UnVsZTsKICAgICAgICAgdGhpcy5ydWxlID0gc3R5bGVSdWxlLnJ1bGU7CiAgICAgICAgIHRoaXMu aWRlbnRpZmllciA9IHN0eWxlUnVsZS5zZWxlY3RvclRleHQgKyAiOnZpYSBpbnNwZWN0b3IiOwor ICAgICAgICB0aGlzLl9ub3JtYWwgPSB0cnVlOwogICAgIH0KIH0KIAo= 112188 2011-10-24 08:19:05 -0700 2011-10-24 08:20:22 -0700 [PATCH] Comments addressed styleadd.patch text/plain 8940 apavlov Y29tbWl0IDBjYTc1OGY4NDRjOWM4ZTBkNGJkZmRiMWZiZDFlOWExNWEzNDNiMmYKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBNb24gT2N0IDI0 IDE2OjU5OjU3IDIwMTEgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjVjZmUyNC4uNzBhYmFlZCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTEwLTI0ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBh dmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1N0eWxlc10gQWRk aW5nIGEgbmV3IHN0eWxlIHJ1bGUgYnJlYWtzIHRoaW5ncworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1u ZXctcnVsZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMt YWRkLW5ldy1ydWxlLmh0bWw6CisKIDIwMTEtMTAtMjEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2 bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdHMgaGFuZyBv biBwYWdlcyB3aXRob3V0IGltZ1tzcmNdIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9zdHlsZXMtYWRkLW5ldy1ydWxlLWV4cGVjdGVkLnR4 dAppbmRleCA2MTM4MTRhLi41NzFlMDVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3Ivc3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXctcnVsZS1leHBlY3RlZC50eHQKQEAg LTEsNCArMSw0IEBACi1UZXN0cyB0aGF0IGFkZGluZyBhIG5ldyBydWxlIHdvcmtzIGFmdGVyIHNp dGNoaW5nIG5vZGVzLgorVGVzdHMgdGhhdCBhZGRpbmcgYSBuZXcgcnVsZSB3b3JrcyBhZnRlciBz d2l0Y2hpbmcgbm9kZXMuCiAKIFRleHQKIEFmdGVyIGFkZGluZyBuZXcgcnVsZSAoaW5zcGVjdGVk KToKQEAgLTcsNiArNyw3IEBAIGZvbnQtc2l6ZTogMTJweDsKIAogPT09PT09PT0gTWF0Y2hlZCBD U1MgUnVsZXMgPT09PT09PT0KIFtleHBhbmRlZF0gI2luc3BlY3RlZCB7ICh2aWEgaW5zcGVjdG9y KQorY29sb3I6IG1hcm9vbjsKIAogW2V4cGFuZGVkXSBkaXYgeyAodXNlciBhZ2VudCBzdHlsZXNo ZWV0KQogZGlzcGxheTogYmxvY2s7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv c3R5bGVzL3N0eWxlcy1hZGQtbmV3LXJ1bGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvc3R5bGVzLWFkZC1uZXctcnVsZS5odG1sCmluZGV4IGQwMGFlZTYuLjE2YjNhMjggMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXctcnVs ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvc3R5bGVzLWFkZC1uZXct cnVsZS5odG1sCkBAIC0xMywyNSArMTMsNDAgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5j dGlvbiBzdGVwMSgpCiAgICAgewotICAgICAgICAvLyBDbGljayBhZGQgbmV3IHJ1bGUKKyAgICAg ICAgLy8gQ2xpY2sgIkFkZCBuZXcgcnVsZSIuCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJhZGQtc3R5bGUtYnV0dG9uLXRlc3QtaWQiKS5jbGljaygpOwotICAgICAgICBJbnNwZWN0 b3JUZXN0LnNlbGVjdE5vZGVBbmRXYWl0Rm9yU3R5bGVzKCJvdGhlciIsIHN0ZXAyKTsKKyAgICAg ICAgdmFyIHNlY3Rpb24gPSBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnNpZGViYXJQYW5l cy5zdHlsZXMuc2VjdGlvbnNbMF1bMl07CisgICAgICAgIHNlY3Rpb24uX3NlbGVjdG9yRWxlbWVu dC5kaXNwYXRjaEV2ZW50KEluc3BlY3RvclRlc3QuY3JlYXRlS2V5RXZlbnQoIkVudGVyIikpOwor ICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUGVuZGluZ0Rpc3BhdGNoZXMoc3RlcDIpOwog ICAgIH0KIAotICAgIGZ1bmN0aW9uIHN0ZXAyKCkgewotICAgICAgICAvLyBDbGljayBhZGQgbmV3 IHJ1bGUKLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFkZC1zdHlsZS1idXR0b24t dGVzdC1pZCIpLmNsaWNrKCk7Ci0gICAgICAgIEluc3BlY3RvclRlc3Quc2VsZWN0Tm9kZUFuZFdh aXRGb3JTdHlsZXMoImluc3BlY3RlZCIsIHN0ZXAzKTsKKyAgICBmdW5jdGlvbiBzdGVwMigpCisg ICAgeworICAgICAgICB2YXIgc2VjdGlvbiA9IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMu c2lkZWJhclBhbmVzLnN0eWxlcy5zZWN0aW9uc1swXVsyXTsKKyAgICAgICAgdmFyIG5ld1Byb3Bl cnR5ID0gc2VjdGlvbi5hZGROZXdCbGFua1Byb3BlcnR5KCk7CisgICAgICAgIG5ld1Byb3BlcnR5 LnN0YXJ0RWRpdGluZygpOworICAgICAgICBuZXdQcm9wZXJ0eS5uYW1lRWxlbWVudC50ZXh0Q29u dGVudCA9ICJjb2xvciI7CisgICAgICAgIG5ld1Byb3BlcnR5Lm5hbWVFbGVtZW50LmRpc3BhdGNo RXZlbnQoSW5zcGVjdG9yVGVzdC5jcmVhdGVLZXlFdmVudCgiRW50ZXIiKSk7CisgICAgICAgIG5l d1Byb3BlcnR5LnZhbHVlRWxlbWVudC50ZXh0Q29udGVudCA9ICJtYXJvb24iOworICAgICAgICBu ZXdQcm9wZXJ0eS52YWx1ZUVsZW1lbnQuZGlzcGF0Y2hFdmVudChJbnNwZWN0b3JUZXN0LmNyZWF0 ZUtleUV2ZW50KCJFbnRlciIpKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlQW5k V2FpdEZvclN0eWxlcygib3RoZXIiLCBzdGVwMyk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gc3Rl cDMoKQogICAgIHsKKyAgICAgICAgLy8gQ2xpY2sgIkFkZCBuZXcgcnVsZSIuCisgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJhZGQtc3R5bGUtYnV0dG9uLXRlc3QtaWQiKS5jbGljaygp OworICAgICAgICBJbnNwZWN0b3JUZXN0LnNlbGVjdE5vZGVBbmRXYWl0Rm9yU3R5bGVzKCJpbnNw ZWN0ZWQiLCBzdGVwNCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc3RlcDQoKQorICAgIHsKICAg ICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVyIGFkZGluZyBuZXcgcnVsZSAoaW5z cGVjdGVkKToiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2VsZWN0ZWRFbGVtZW50U3R5 bGVzKHRydWUsIGZhbHNlLCB0cnVlKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2Rl QW5kV2FpdEZvclN0eWxlcygib3RoZXIiLCBzdGVwNCk7CisgICAgICAgIEluc3BlY3RvclRlc3Qu c2VsZWN0Tm9kZUFuZFdhaXRGb3JTdHlsZXMoIm90aGVyIiwgc3RlcDUpOwogICAgIH0KIAotICAg IGZ1bmN0aW9uIHN0ZXA0KCkKKyAgICBmdW5jdGlvbiBzdGVwNSgpCiAgICAgewogICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiQWZ0ZXIgYWRkaW5nIG5ldyBydWxlIChvdGhlcik6Iik7 CiAgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlLCBm YWxzZSwgdHJ1ZSk7CkBAIC00NCw3ICs1OSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiA8Ym9keSBv bmxvYWQ9InJ1blRlc3QoKSI+CiA8cD4KLVRlc3RzIHRoYXQgYWRkaW5nIGEgbmV3IHJ1bGUgd29y a3MgYWZ0ZXIgc2l0Y2hpbmcgbm9kZXMuCitUZXN0cyB0aGF0IGFkZGluZyBhIG5ldyBydWxlIHdv cmtzIGFmdGVyIHN3aXRjaGluZyBub2Rlcy4KIDwvcD4KIAogPGRpdiBpZD0iaW5zcGVjdGVkIiBz dHlsZT0iZm9udC1zaXplOiAxMnB4Ij5UZXh0PC9kaXY+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEwNGNlZS4u YzczNWQ3MSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTEwLTI0ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW1N0eWxlc10gQWRkaW5nIGEgbmV3IHN0eWxlIHJ1bGUgYnJlYWtzIHRoaW5ncworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBoYWQgdXNlZCB0byBz d2FwIEJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiBwcm90b3R5cGUgYW5kIHJlY2VudGx5IGdv dCByaWQgb2YgdGhpcyBoYWNrLAorICAgICAgICBidXQgc3RpbGwgaGFkIGRlcGVuZGVuY2llcyBv biB0aGUgb2xkIGJlaGF2aW9yLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFu ZS5wcm90b3R5cGUuX3JlZnJlc2hTdHlsZVJ1bGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b21wdXRlZFN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLnJlYnVpbGRDb21wdXRlZFRy YWNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24u cHJvdG90eXBlLmdldCBpc0JsYW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmV4cGFuZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5lZGl0aW5nU2VsZWN0b3JD b21taXR0ZWQuc3VjY2Vzc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CbGFua1N0 eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNvbW1pdHRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3Rv dHlwZS5lZGl0aW5nU2VsZWN0b3JDYW5jZWxsZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJs YW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUubWFrZU5vcm1hbCk6CisKIDIwMTEt MTAtMjEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBBdWRpdHMgaGFuZyBvbiBwYWdlcyB3aXRob3V0IGltZ1tzcmNdIGVs ZW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA1MTc5NWFiLi5hN2JiNDFjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMKQEAgLTM3NSw3ICszNzUsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogICAgICAgICB2YXIgc3R5bGVSdWxlcyA9IFtdOwogICAgICAgICBmb3IgKHZh ciBpID0gMDsgc2VjdGlvbnMgJiYgaSA8IHNlY3Rpb25zLmxlbmd0aDsgKytpKSB7CiAgICAgICAg ICAgICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25zW2ldOwotICAgICAgICAgICAgaWYgKHNlY3Rpb24g aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uKQorICAg ICAgICAgICAgaWYgKHNlY3Rpb24uaXNCbGFuaykKICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIGlmIChzZWN0aW9uLmNvbXB1dGVkU3R5bGUpCiAgICAgICAgICAgICAgICAg c2VjdGlvbi5zdHlsZVJ1bGUuc3R5bGUgPSBub2RlQ29tcHV0ZWRTdHlsZTsKQEAgLTEzMDcsNyAr MTMwNyw3IEBAIFdlYkluc3BlY3Rvci5Db21wdXRlZFN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWN0aW9ucy5s ZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBzZWN0aW9uc1tpXTsKLSAg ICAgICAgICAgIGlmIChzZWN0aW9uLmNvbXB1dGVkU3R5bGUgfHwgc2VjdGlvbiBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24pCisgICAgICAgICAgICBp ZiAoc2VjdGlvbi5jb21wdXRlZFN0eWxlIHx8IHNlY3Rpb24uaXNCbGFuaykKICAgICAgICAgICAg ICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBzZWN0aW9u LnVuaXF1ZVByb3BlcnRpZXMubGVuZ3RoOyArK2opIHsKQEAgLTEzNTUsMTMgKzEzNTUsMjQgQEAg V2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVu dFBhbmUsIGRlZmF1bHRTZWxlY3RvclQKIH0KIAogV2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9w ZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CisgICAgZ2V0IGlzQmxhbmsoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuICF0aGlzLl9ub3JtYWw7CisgICAgfSwKKwogICAgIGV4cGFuZDogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgLy8gRG8gbm90aGluZywgYmxhbmsgc2VjdGlvbnMgYXJlIG5v dCBleHBhbmRhYmxlLgorICAgICAgICBpZiAoIXRoaXMuaXNCbGFuaykKKyAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5leHBhbmQuY2FsbCh0 aGlzKTsKICAgICB9LAogCi0gICAgZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkOiBmdW5jdGlvbihl bGVtZW50LCBuZXdDb250ZW50LCBvbGRDb250ZW50LCBjb250ZXh0KQorICAgIGVkaXRpbmdTZWxl Y3RvckNvbW1pdHRlZDogZnVuY3Rpb24oZWxlbWVudCwgbmV3Q29udGVudCwgb2xkQ29udGVudCwg Y29udGV4dCwgbW92ZURpcmVjdGlvbikKICAgICB7CisgICAgICAgIGlmICghdGhpcy5pc0JsYW5r KSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90 b3R5cGUuZWRpdGluZ1NlbGVjdG9yQ29tbWl0dGVkLmNhbGwodGhpcywgZWxlbWVudCwgbmV3Q29u dGVudCwgb2xkQ29udGVudCwgY29udGV4dCwgbW92ZURpcmVjdGlvbik7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICBmdW5jdGlvbiBzdWNjZXNzQ2FsbGJhY2sobmV3 UnVsZSwgZG9lc1NlbGVjdG9yQWZmZWN0U2VsZWN0ZWROb2RlKQogICAgICAgICB7CiAgICAgICAg ICAgICB2YXIgc3R5bGVSdWxlID0geyBzZWN0aW9uOiB0aGlzLCBzdHlsZTogbmV3UnVsZS5zdHls ZSwgc2VsZWN0b3JUZXh0OiBuZXdSdWxlLnNlbGVjdG9yVGV4dCwgc291cmNlVVJMOiBuZXdSdWxl LnNvdXJjZVVSTCwgcnVsZTogbmV3UnVsZSB9OwpAQCAtMTM3NCw4ICsxMzg1LDggQEAgV2ViSW5z cGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJ2aWEgaW5zcGVjdG9yIik7CiAgICAgICAgICAgICB0aGlzLmV4cGFuZCgpOwotICAg ICAgICAgICAgaWYgKHRoaXMuZWxlbWVudC5wYXJlbnRFbGVtZW50KSAgLy8gTWlnaHQgaGF2ZSBi ZWVuIGRldGFjaGVkIGFscmVhZHkuCi0gICAgICAgICAgICAgICAgdGhpcy5hZGROZXdCbGFua1By b3BlcnR5KCkuc3RhcnRFZGl0aW5nKCk7CisgICAgICAgICAgICBpZiAodGhpcy5lbGVtZW50LnBh cmVudEVsZW1lbnQpIC8vIE1pZ2h0IGhhdmUgYmVlbiBkZXRhY2hlZCBhbHJlYWR5LgorICAgICAg ICAgICAgICAgIHRoaXMuX21vdmVFZGl0b3JGcm9tU2VsZWN0b3IobW92ZURpcmVjdGlvbik7CiAg ICAgICAgIH0KIAogICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuYWRkUnVsZSh0aGlzLnBh bmUubm9kZS5pZCwgbmV3Q29udGVudCwgc3VjY2Vzc0NhbGxiYWNrLmJpbmQodGhpcyksIHRoaXMu ZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkLmJpbmQodGhpcykpOwpAQCAtMTM4Myw2ICsxMzk0LDEx IEBAIFdlYkluc3BlY3Rvci5CbGFua1N0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0g ewogCiAgICAgZWRpdGluZ1NlbGVjdG9yQ2FuY2VsbGVkOiBmdW5jdGlvbigpCiAgICAgeworICAg ICAgICBpZiAoIXRoaXMuaXNCbGFuaykgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlN0eWxl UHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLmVkaXRpbmdTZWxlY3RvckNhbmNlbGxlZC5jYWxs KHRoaXMpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5w YW5lLnJlbW92ZVNlY3Rpb24odGhpcyk7CiAgICAgfSwKIApAQCAtMTM5Miw2ICsxNDA4LDkgQEAg V2ViSW5zcGVjdG9yLkJsYW5rU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuc3R5bGVSdWxlID0gc3R5bGVSdWxlOwogICAgICAgICB0aGlzLnJ1bGUgPSBz dHlsZVJ1bGUucnVsZTsKICAgICAgICAgdGhpcy5pZGVudGlmaWVyID0gc3R5bGVSdWxlLnNlbGVj dG9yVGV4dCArICI6dmlhIGluc3BlY3RvciI7CisKKyAgICAgICAgLy8gRklYTUU6IHJlcGxhY2Ug dGhpcyBpbnN0YW5jZSBieSBhIG5vcm1hbCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2Vj dGlvbi4KKyAgICAgICAgdGhpcy5fbm9ybWFsID0gdHJ1ZTsKICAgICB9CiB9CiAK