107263 2013-01-18 05:07:58 -0800 Web Inspector: Allow SplitView to change orientation after the construction 2013-01-20 23:39:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 kaznacheev webkit-unassigned apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 810490 0 kaznacheev 2013-01-18 05:07:58 -0800 Once WebInspector.SplitView object is created its orientation cannot be changed. This needs to change to make the layout more flexible (see https://bugs.webkit.org/show_bug.cgi?id=107129). An alternative solution is to recreate WebInspector.SplitView or WebInspector.SidebarView with a different orientation which would require extensive changes at every client of said classes. 810495 1 183429 kaznacheev 2013-01-18 05:27:23 -0800 Created attachment 183429 Patch 810519 2 183429 pfeldman 2013-01-18 06:01:40 -0800 Comment on attachment 183429 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183429&action=review Few nits and it is good to go. > Source/WebCore/inspector/front-end/SplitView.js:45 > this._firstElement = document.createElement("div"); this._firstElement = this.element.createChild("div", "split-view-contents"); will do the same. > Source/WebCore/inspector/front-end/SplitView.js:50 > + this._secondElement.className = "split-view-contents"; ditto > Source/WebCore/inspector/front-end/SplitView.js:54 > + this._resizerElement.className = "split-view-resizer"; ditto > Source/WebCore/inspector/front-end/SplitView.js:81 > + setIsVertical: function(isVertical) setVertical > Source/WebCore/inspector/front-end/SplitView.js:95 > + _innerSetIsVertical: function(isVertical) _innerSetVertical > Source/WebCore/inspector/front-end/SplitView.js:281 > + _updateTotalSize: function() { { on the next line > Source/WebCore/inspector/front-end/SplitView.js:295 > + this._resizerElement.style.removeProperty("left"); This might look better as a part of removeAllLayoutProperties > Source/WebCore/inspector/front-end/SplitView.js:396 > + _onDragStart: function(event) { { on the next line > Source/WebCore/inspector/front-end/SplitView.js:405 > + if (!this._sidebarSizeSettingName) 4 space indent please > Source/WebCore/inspector/front-end/SplitView.js:421 > + return (sizeSetting ? sizeSetting.get() : 0 ) || (this._isVertical ? this._savedSidebarWidth : this._savedSidebarHeight); no space after 0, please split this into two lines? > Source/WebCore/inspector/front-end/SplitView.js:430 > + this._savedSidebarWidth = size; It is unfortunate split is now Width/Height aware, but I don't see a way to make it simpler. Maintaining both settings at all times and making settingName required is probably a good thing that will save on some lines here as well. 810556 3 183445 kaznacheev 2013-01-18 07:10:37 -0800 Created attachment 183445 Patch 811854 4 183445 pfeldman 2013-01-20 23:31:55 -0800 Comment on attachment 183445 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183445&action=review > Source/WebCore/inspector/front-end/SplitView.js:46 > + Now that each element takes one line to initialize, we no longer need whitespace between blocks. 811862 5 183445 webkit.review.bot 2013-01-20 23:39:42 -0800 Comment on attachment 183445 Patch Clearing flags on attachment: 183445 Committed r140304: <http://trac.webkit.org/changeset/140304> 811863 6 webkit.review.bot 2013-01-20 23:39:45 -0800 All reviewed patches have been landed. Closing bug. 183429 2013-01-18 05:27:23 -0800 2013-01-18 07:10:32 -0800 Patch bug-107263-20130118172421.patch text/plain 12510 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQxYTA3MzAzZThkYjUy MTlhM2Q0MWUyYjRjNWI0ZmE3YTk3NmVkNC4uYzBkNjdlZmZlMDQ5YjM5ZWEyNzIyOTFkMDBiMmUz YmQ4ZGY5YzQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAxLTE4ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFsbG93IFNwbGl0VmlldyB0byBjaGFuZ2Ugb3JpZW50YXRpb24gYWZ0ZXIg dGhlIGNvbnN0cnVjdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNzI2MworCisgICAgICAgIEFkZGVkIFNwbGl0Vmlldy5wcm90b3R5cGUuc2V0 SXNWZXJ0aWNhbCB0byBjaGFuZ2UgdGhlIG9yaWVudGF0aW9uIG9uIHRoZSBmbHkuCisgICAgICAg IEluc3RlYWQgb2YgcGFzc2luZyBkZWZhdWx0IHNpZGViYXIgc2l6ZSB0byB0aGUgY29uc3RydWN0 b3IgdGhlIGNsaWVudAorICAgICAgICBtYXkgbm93IHBhc3Mgc2VwYXJhdGUgZGVmYXVsdHMgZm9y IHRoZSBzaWRlYmFyIHdpZHRoIGFuZCBoZWlnaHQuIFBhc3NpbmcKKyAgICAgICAganVzdCBvbmUg ZGVmYXVsdCB3b3JrcyBhcyBiZWZvcmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TcGxpdFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLmlzVmVydGljYWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuc2V0SXNWZXJ0aWNhbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5faW5uZXJTZXRJc1Zl cnRpY2FsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl91cGRh dGVMYXlvdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuaXNT aWRlYmFyU2Vjb25kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBl LnNob3dCb3RoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl91 cGRhdGVUb3RhbFNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5 cGUuX2lubmVyU2V0U2lkZWJhclNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmll dy5wcm90b3R5cGUud2FzU2hvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5w cm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90 b3R5cGUuaW5zdGFsbFJlc2l6ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5w cm90b3R5cGUuX29uRHJhZ1N0YXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcu cHJvdG90eXBlLl9zaXplU2V0dGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3 LnByb3RvdHlwZS5fbGFzdFNpZGViYXJTaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxp dFZpZXcucHJvdG90eXBlLmdldCBfc2F2ZVNpZGViYXJTaXplKToKKwogMjAxMy0wMS0xOCAgRXVn ZW5lIEtseXVjaG5pa292ICA8ZXVzdGFzLmJ1Z0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogVGltZWxpbmU6IG5lc3QgdGltZS90aW1lRW5kIHJlY29yZHMgd2hlbiBwb3NzaWJs ZSAoaW4gZ2x1ZS1tb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TcGxpdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NwbGl0Vmlldy5qcwppbmRleCBhZGZjOTk2NzM5YzZhYzI2YWYzMzY3MTQ2MzYzZDhiYjg4MjY5 MmFmLi5mZjMwNzhhOWYyMjdlOWM3YzY4YjRmMmVlYTFiMDJjMWU4NTYxYmFiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcwpAQCAtMzEsNTEg KzMxLDEwNyBAQAogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICogQHBhcmFtIHti b29sZWFufSBpc1ZlcnRpY2FsCiAgKiBAcGFyYW0ge3N0cmluZz19IHNpZGViYXJTaXplU2V0dGlu Z05hbWUKLSAqIEBwYXJhbSB7bnVtYmVyPX0gZGVmYXVsdFNpZGViYXJTaXplCisgKiBAcGFyYW0g e251bWJlcj19IGRlZmF1bHRTaWRlYmFyV2lkdGgKKyAqIEBwYXJhbSB7bnVtYmVyPX0gZGVmYXVs dFNpZGViYXJIZWlnaHQKICAqLwotV2ViSW5zcGVjdG9yLlNwbGl0VmlldyA9IGZ1bmN0aW9uKGlz VmVydGljYWwsIHNpZGViYXJTaXplU2V0dGluZ05hbWUsIGRlZmF1bHRTaWRlYmFyU2l6ZSkKK1dl Ykluc3BlY3Rvci5TcGxpdFZpZXcgPSBmdW5jdGlvbihpc1ZlcnRpY2FsLCBzaWRlYmFyU2l6ZVNl dHRpbmdOYW1lLCBkZWZhdWx0U2lkZWJhcldpZHRoLCBkZWZhdWx0U2lkZWJhckhlaWdodCkKIHsK ICAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOwotICAgIHRoaXMuX2lzVmVydGljYWwg PSBpc1ZlcnRpY2FsOwogCiAgICAgdGhpcy5yZWdpc3RlclJlcXVpcmVkQ1NTKCJzcGxpdFZpZXcu Y3NzIik7CiAKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInNwbGl0LXZpZXciOwogCiAg ICAgdGhpcy5fZmlyc3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgdGhpcy5fZmlyc3RFbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3LWNvbnRlbnRzIHNw bGl0LXZpZXctY29udGVudHMtIiArIChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6ICJob3Jpem9u dGFsIik7Ci0gICAgaWYgKGlzVmVydGljYWwpCi0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5z dHlsZS5sZWZ0ID0gMDsKLSAgICBlbHNlCi0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHls ZS50b3AgPSAwOworICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5jbGFzc05hbWUgPSAic3BsaXQtdmll dy1jb250ZW50cyI7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2ZpcnN0RWxl bWVudCk7CiAKICAgICB0aGlzLl9zZWNvbmRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5fc2Vjb25kRWxlbWVudC5jbGFzc05hbWUgPSAic3BsaXQtdmll dy1jb250ZW50cyBzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyAoaXNWZXJ0aWNhbCA/ICJ2ZXJ0aWNh bCIgOiAiaG9yaXpvbnRhbCIpOwotICAgIGlmIChpc1ZlcnRpY2FsKQotICAgICAgICB0aGlzLl9z ZWNvbmRFbGVtZW50LnN0eWxlLnJpZ2h0ID0gMDsKLSAgICBlbHNlCi0gICAgICAgIHRoaXMuX3Nl Y29uZEVsZW1lbnQuc3R5bGUuYm90dG9tID0gMDsKKyAgICB0aGlzLl9zZWNvbmRFbGVtZW50LmNs YXNzTmFtZSA9ICJzcGxpdC12aWV3LWNvbnRlbnRzIjsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fc2Vjb25kRWxlbWVudCk7CiAKICAgICB0aGlzLl9yZXNpemVyRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50 LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3LXJlc2l6ZXIgc3BsaXQtdmlldy1yZXNpemVyLSIgKyAo aXNWZXJ0aWNhbCA/ICJ2ZXJ0aWNhbCIgOiAiaG9yaXpvbnRhbCIpOworICAgIHRoaXMuX3Jlc2l6 ZXJFbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3LXJlc2l6ZXIiOwogICAgIHRoaXMuaW5z dGFsbFJlc2l6ZXIodGhpcy5fcmVzaXplckVsZW1lbnQpOwogICAgIHRoaXMuX3Jlc2l6YWJsZSA9 IHRydWU7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Jlc2l6ZXJFbGVtZW50 KTsKIAotICAgIGRlZmF1bHRTaWRlYmFyU2l6ZSA9IGRlZmF1bHRTaWRlYmFyU2l6ZSB8fCAyMDA7 Ci0gICAgdGhpcy5fc2F2ZWRTaWRlYmFyU2l6ZSA9IGRlZmF1bHRTaWRlYmFyU2l6ZTsKKyAgICB0 aGlzLl9zYXZlZFNpZGViYXJXaWR0aCA9IGRlZmF1bHRTaWRlYmFyV2lkdGggfHwgMjAwOworICAg IHRoaXMuX3NhdmVkU2lkZWJhckhlaWdodCA9IGRlZmF1bHRTaWRlYmFySGVpZ2h0IHx8IHRoaXMu X3NhdmVkU2lkZWJhcldpZHRoOwogCiAgICAgdGhpcy5fc2lkZWJhclNpemVTZXR0aW5nTmFtZSA9 IHNpZGViYXJTaXplU2V0dGluZ05hbWU7Ci0gICAgaWYgKHRoaXMuX3NpZGViYXJTaXplU2V0dGlu Z05hbWUpCi0gICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5nc1t0aGlzLl9zaWRlYmFyU2l6ZVNl dHRpbmdOYW1lXSA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKHRoaXMuX3Np ZGViYXJTaXplU2V0dGluZ05hbWUsIHVuZGVmaW5lZCk7CiAKICAgICB0aGlzLl9zZWNvbmRJc1Np ZGViYXIgPSB0cnVlOworCisgICAgdGhpcy5faW5uZXJTZXRJc1ZlcnRpY2FsKGlzVmVydGljYWwp OwogfQogCiBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAvKioKKyAg ICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLworICAgIGlzVmVydGljYWw6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9pc1ZlcnRpY2FsOworICAgIH0sCisKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzVmVydGljYWwKKyAgICAgKi8KKyAgICBz ZXRJc1ZlcnRpY2FsOiBmdW5jdGlvbihpc1ZlcnRpY2FsKQorICAgIHsKKyAgICAgICAgaWYgKHRo aXMuX2lzVmVydGljYWwgPT09IGlzVmVydGljYWwpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgdGhpcy5faW5uZXJTZXRJc1ZlcnRpY2FsKGlzVmVydGljYWwpOworCisgICAgICAgIGlm ICh0aGlzLmlzU2hvd2luZygpKQorICAgICAgICAgICAgdGhpcy5fdXBkYXRlTGF5b3V0KCk7Cisg ICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gaXNWZXJ0aWNhbAorICAg ICAqLworICAgIF9pbm5lclNldElzVmVydGljYWw6IGZ1bmN0aW9uKGlzVmVydGljYWwpCisgICAg eworICAgICAgICB0aGlzLl9pc1ZlcnRpY2FsID0gaXNWZXJ0aWNhbDsKKworICAgICAgICB0aGlz Ll9yZW1vdmVBbGxMYXlvdXRQcm9wZXJ0aWVzKCk7CisKKyAgICAgICAgaWYgKGlzVmVydGljYWwp IHsKKyAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5sZWZ0ID0gMDsKKyAgICAg ICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmlnaHQgPSAwOworICAgICAgICAgICAg dGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ0b3AiKTsKKyAgICAgICAg ICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImJvdHRvbSIpOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLnRv cCA9IDA7CisgICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmJvdHRvbSA9IDA7 CisgICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImxl ZnQiKTsKKyAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVy dHkoInJpZ2h0Iik7CisgICAgICAgIH0KKworICAgICAgICB2YXIgb2xkRGlyZWN0aW9uID0gKGlz VmVydGljYWwgPyAiaG9yaXpvbnRhbCIgOiAidmVydGljYWwiKTsKKyAgICAgICAgdmFyIG5ld0Rp cmVjdGlvbiA9IChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6ICJob3Jpem9udGFsIik7CisKKyAg ICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29u dGVudHMtIiArIG9sZERpcmVjdGlvbik7CisgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5hZGRT dHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOworCisgICAg ICAgIHRoaXMuX3NlY29uZEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1jb250 ZW50cy0iICsgb2xkRGlyZWN0aW9uKTsKKyAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5hZGRT dHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOworCisgICAg ICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXctcmVz aXplci0iICsgb2xkRGlyZWN0aW9uKTsKKyAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuYWRk U3R5bGVDbGFzcygic3BsaXQtdmlldy1yZXNpemVyLSIgKyBuZXdEaXJlY3Rpb24pOworICAgIH0s CisgIAorICAgIF91cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMu X3VwZGF0ZVRvdGFsU2l6ZSgpOworCisgICAgICAgIGRlbGV0ZSB0aGlzLl9zaWRlYmFyU2l6ZTsg IC8vIEZvcmNlIHVwZGF0ZS4KKyAgICAgICAgdGhpcy5zZXRTaWRlYmFyU2l6ZSh0aGlzLl9sYXN0 U2lkZWJhclNpemUoKSk7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEByZXR1cm4ge0VsZW1l bnR9CiAgICAgICovCiAgICAgZmlyc3RFbGVtZW50OiBmdW5jdGlvbigpCkBAIC05Miw2ICsxNDgs MTQgQEAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAg IC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNTaWRlYmFyU2Vj b25kOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc2Vjb25kSXNTaWRl YmFyOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHNlY29uZElz U2lkZWJhcgogICAgICAqLwogICAgIHNldFNlY29uZElzU2lkZWJhcjogZnVuY3Rpb24oc2Vjb25k SXNTaWRlYmFyKQpAQCAtMTY1LDkgKzIyOSw3IEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3Mo ImhpZGRlbiIpOwogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3Mo Im1heGltaXplZCIpOwogCi0gICAgICAgIC8vIEZvcmNlIHVwZGF0ZQotICAgICAgICBkZWxldGUg dGhpcy5fc2lkZWJhclNpemU7Ci0gICAgICAgIHRoaXMuc2V0U2lkZWJhclNpemUodGhpcy5fbGFz dFNpZGViYXJTaXplKCkpOworICAgICAgICB0aGlzLl91cGRhdGVMYXlvdXQoKTsKIAogICAgICAg ICB0aGlzLnNldFJlc2l6YWJsZSh0cnVlKTsKICAgICAgICAgdGhpcy5kb1Jlc2l6ZSgpOwpAQCAt MjE2LDYgKzI3OCwxMCBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgcmV0dXJuIHRoaXMuX3RvdGFsU2l6ZTsKICAgICB9LAogCisgICAgX3VwZGF0ZVRvdGFs U2l6ZTogZnVuY3Rpb24oKSB7CisgICAgICAgIHRoaXMuX3RvdGFsU2l6ZSA9IHRoaXMuX2lzVmVy dGljYWwgPyB0aGlzLmVsZW1lbnQub2Zmc2V0V2lkdGggOiB0aGlzLmVsZW1lbnQub2Zmc2V0SGVp Z2h0OworICAgIH0sCisgIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBzaXplCiAg ICAgICovCkBAIC0yMjYsNiArMjkyLDExIEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90 eXBlID0gewogCiAgICAgICAgIHRoaXMuX3JlbW92ZUFsbExheW91dFByb3BlcnRpZXMoKTsKIAor ICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgibGVmdCIp OworICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicmln aHQiKTsKKyAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHko InRvcCIpOworICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0 eSgiYm90dG9tIik7CisKICAgICAgICAgaWYgKHRoaXMuX2lzVmVydGljYWwpIHsKICAgICAgICAg ICAgIHZhciByZXNpemVyV2lkdGggPSB0aGlzLl9yZXNpemVyRWxlbWVudC5vZmZzZXRXaWR0aDsK ICAgICAgICAgICAgIGlmICh0aGlzLl9zZWNvbmRJc1NpZGViYXIpIHsKQEAgLTIzMywyMCArMzA0 LDIwIEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUud2lkdGggPSBzaXplICsgInB4IjsKICAgICAg ICAgICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yaWdodCA9IHNpemUgLSByZXNp emVyV2lkdGggLyAyICsgInB4IjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAg ICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLndpZHRoID0gc2l6ZSArICJweCI7OwotICAgICAg ICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUubGVmdCA9IHNpemUgKyAicHgiOzsK KyAgICAgICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUud2lkdGggPSBzaXplICsg InB4IjsKKyAgICAgICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmxlZnQgPSBz aXplICsgInB4IjsKICAgICAgICAgICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5s ZWZ0ID0gc2l6ZSAtIHJlc2l6ZXJXaWR0aCAvIDIgKyAicHgiOwogICAgICAgICAgICAgfQogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgdmFyIHJlc2l6ZXJIZWlnaHQgPSB0aGlzLl9yZXNp emVyRWxlbWVudC5vZmZzZXRIZWlnaHQ7CiAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKHRo aXMuX3NlY29uZElzU2lkZWJhcikgewotICAgICAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVu dC5zdHlsZS5ib3R0b20gPSBzaXplICsgInB4Ijs7Ci0gICAgICAgICAgICAgICAgdGhpcy5fc2Vj b25kRWxlbWVudC5zdHlsZS5oZWlnaHQgPSBzaXplICsgInB4Ijs7CisgICAgICAgICAgICAgICAg dGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLmJvdHRvbSA9IHNpemUgKyAicHgiOworICAgICAgICAg ICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gc2l6ZSArICJweCI7CiAg ICAgICAgICAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuc3R5bGUuYm90dG9tID0gc2l6ZSAt IHJlc2l6ZXJIZWlnaHQgLyAyICsgInB4IjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLmhlaWdodCA9IHNpemUgKyAicHgiOzsK LSAgICAgICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLnRvcCA9IHNpemUgKyAi cHgiOzsKKyAgICAgICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0g c2l6ZSArICJweCI7CisgICAgICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS50 b3AgPSBzaXplICsgInB4IjsKICAgICAgICAgICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5z dHlsZS50b3AgPSBzaXplIC0gcmVzaXplckhlaWdodCAvIDIgKyAicHgiOwogICAgICAgICAgICAg fQogICAgICAgICB9CkBAIC0yNzAsMTQgKzM0MSwxMiBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3 LnByb3RvdHlwZSA9IHsKIAogICAgIHdhc1Nob3duOiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB0aGlzLl90b3RhbFNpemUgPSB0aGlzLl9pc1ZlcnRpY2FsID8gdGhpcy5lbGVtZW50Lm9mZnNl dFdpZHRoIDogdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodDsKLSAgICAgICAgdGhpcy5zZXRTaWRl YmFyU2l6ZSh0aGlzLl9sYXN0U2lkZWJhclNpemUoKSk7CisgICAgICAgIHRoaXMuX3VwZGF0ZUxh eW91dCgpOwogICAgIH0sCiAKICAgICBvblJlc2l6ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAg ICAgdmFyIG9sZFRvdGFsU2l6ZSA9IHRoaXMuX3RvdGFsU2l6ZTsKLSAgICAgICAgdGhpcy5fdG90 YWxTaXplID0gdGhpcy5faXNWZXJ0aWNhbCA/IHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aCA6IHRo aXMuZWxlbWVudC5vZmZzZXRIZWlnaHQ7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRvdGFsU2l6ZSgp OwogICAgIH0sCiAKICAgICAvKioKQEAgLTMxNyw3ICszODYsMzAgQEAgV2ViSW5zcGVjdG9yLlNw bGl0Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgaW5zdGFsbFJlc2l6ZXI6IGZ1bmN0 aW9uKHJlc2l6ZXJFbGVtZW50KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmluc3RhbGxE cmFnSGFuZGxlKHJlc2l6ZXJFbGVtZW50LCB0aGlzLl9zdGFydFJlc2l6ZXJEcmFnZ2luZy5iaW5k KHRoaXMpLCB0aGlzLl9yZXNpemVyRHJhZ2dpbmcuYmluZCh0aGlzKSwgdGhpcy5fZW5kUmVzaXpl ckRyYWdnaW5nLmJpbmQodGhpcyksIHRoaXMuX2lzVmVydGljYWwgPyAiZXctcmVzaXplIiA6ICJu cy1yZXNpemUiKTsKKyAgICAgICAgcmVzaXplckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgdGhpcy5fb25EcmFnU3RhcnQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKgorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisg ICAgX29uRHJhZ1N0YXJ0OiBmdW5jdGlvbihldmVudCkgeworICAgICAgICBXZWJJbnNwZWN0b3Iu X2VsZW1lbnREcmFnU3RhcnQodGhpcy5fc3RhcnRSZXNpemVyRHJhZ2dpbmcuYmluZCh0aGlzKSwg dGhpcy5fcmVzaXplckRyYWdnaW5nLmJpbmQodGhpcyksIHRoaXMuX2VuZFJlc2l6ZXJEcmFnZ2lu Zy5iaW5kKHRoaXMpLCB0aGlzLl9pc1ZlcnRpY2FsID8gImV3LXJlc2l6ZSIgOiAibnMtcmVzaXpl IiwgZXZlbnQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0 b3IuU2V0dGluZ30KKyAgICAgKi8KKyAgICBfc2l6ZVNldHRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICBpZiAoIXRoaXMuX3NpZGViYXJTaXplU2V0dGluZ05hbWUpCisgICAgICAgIHJldHVy biBudWxsOworCisgICAgICB2YXIgc2V0dGluZ05hbWUgPSB0aGlzLl9zaWRlYmFyU2l6ZVNldHRp bmdOYW1lICsgKHRoaXMuX2lzVmVydGljYWwgPyAiIiA6ICJIIik7CisgICAgICBpZiAoIVdlYklu c3BlY3Rvci5zZXR0aW5nc1tzZXR0aW5nTmFtZV0pCisgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0 aW5nc1tzZXR0aW5nTmFtZV0gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZyhz ZXR0aW5nTmFtZSwgdW5kZWZpbmVkKTsKKworICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5zZXR0 aW5nc1tzZXR0aW5nTmFtZV07CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMzI1LDcgKzQxNyw4IEBA IFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9sYXN0 U2lkZWJhclNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zaWRl YmFyU2l6ZVNldHRpbmdOYW1lID8gV2ViSW5zcGVjdG9yLnNldHRpbmdzW3RoaXMuX3NpZGViYXJT aXplU2V0dGluZ05hbWVdLmdldCgpIHx8IHRoaXMuX3NhdmVkU2lkZWJhclNpemUgOiB0aGlzLl9z YXZlZFNpZGViYXJTaXplOworICAgICAgICB2YXIgc2l6ZVNldHRpbmcgPSB0aGlzLl9zaXplU2V0 dGluZygpOworICAgICAgICByZXR1cm4gKHNpemVTZXR0aW5nID8gc2l6ZVNldHRpbmcuZ2V0KCkg OiAwICkgfHwgKHRoaXMuX2lzVmVydGljYWwgPyB0aGlzLl9zYXZlZFNpZGViYXJXaWR0aCA6IHRo aXMuX3NhdmVkU2lkZWJhckhlaWdodCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMzMzLDExICs0 MjYsMTQgQEAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgX3NhdmVTaWRlYmFyU2l6ZTogZnVuY3Rpb24oc2l6ZSkKICAgICB7Ci0gICAgICAgIHRoaXMu X3NhdmVkU2lkZWJhclNpemUgPSBzaXplOwotICAgICAgICBpZiAoIXRoaXMuX3NpZGViYXJTaXpl U2V0dGluZ05hbWUpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmICh0aGlzLl9pc1Zl cnRpY2FsKQorICAgICAgICAgICAgdGhpcy5fc2F2ZWRTaWRlYmFyV2lkdGggPSBzaXplOworICAg ICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl9zYXZlZFNpZGViYXJIZWlnaHQgPSBzaXplOwog Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5nc1t0aGlzLl9zaWRlYmFyU2l6ZVNldHRpbmdO YW1lXS5zZXQodGhpcy5fc2F2ZWRTaWRlYmFyU2l6ZSk7CisgICAgICAgIHZhciBzaXplU2V0dGlu ZyA9IHRoaXMuX3NpemVTZXR0aW5nKCk7CisgICAgICAgIGlmIChzaXplU2V0dGluZykKKyAgICAg ICAgICAgIHNpemVTZXR0aW5nLnNldChzaXplKTsKICAgICB9LAogCiAgICAgX19wcm90b19fOiBX ZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUK 183445 2013-01-18 07:10:37 -0800 2013-01-20 23:39:41 -0800 Patch bug-107263-20130118190736.patch text/plain 12650 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQxYTA3MzAzZThkYjUy MTlhM2Q0MWUyYjRjNWI0ZmE3YTk3NmVkNC4uYzBkNjdlZmZlMDQ5YjM5ZWEyNzIyOTFkMDBiMmUz YmQ4ZGY5YzQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAxLTE4ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEFsbG93IFNwbGl0VmlldyB0byBjaGFuZ2Ugb3JpZW50YXRpb24gYWZ0ZXIg dGhlIGNvbnN0cnVjdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNzI2MworCisgICAgICAgIEFkZGVkIFNwbGl0Vmlldy5wcm90b3R5cGUuc2V0 SXNWZXJ0aWNhbCB0byBjaGFuZ2UgdGhlIG9yaWVudGF0aW9uIG9uIHRoZSBmbHkuCisgICAgICAg IEluc3RlYWQgb2YgcGFzc2luZyBkZWZhdWx0IHNpZGViYXIgc2l6ZSB0byB0aGUgY29uc3RydWN0 b3IgdGhlIGNsaWVudAorICAgICAgICBtYXkgbm93IHBhc3Mgc2VwYXJhdGUgZGVmYXVsdHMgZm9y IHRoZSBzaWRlYmFyIHdpZHRoIGFuZCBoZWlnaHQuIFBhc3NpbmcKKyAgICAgICAganVzdCBvbmUg ZGVmYXVsdCB3b3JrcyBhcyBiZWZvcmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TcGxpdFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLmlzVmVydGljYWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuc2V0SXNWZXJ0aWNhbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5faW5uZXJTZXRJc1Zl cnRpY2FsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl91cGRh dGVMYXlvdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuaXNT aWRlYmFyU2Vjb25kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBl LnNob3dCb3RoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl91 cGRhdGVUb3RhbFNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5 cGUuX2lubmVyU2V0U2lkZWJhclNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmll dy5wcm90b3R5cGUud2FzU2hvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5w cm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90 b3R5cGUuaW5zdGFsbFJlc2l6ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5w cm90b3R5cGUuX29uRHJhZ1N0YXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcu cHJvdG90eXBlLl9zaXplU2V0dGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3 LnByb3RvdHlwZS5fbGFzdFNpZGViYXJTaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxp dFZpZXcucHJvdG90eXBlLmdldCBfc2F2ZVNpZGViYXJTaXplKToKKwogMjAxMy0wMS0xOCAgRXVn ZW5lIEtseXVjaG5pa292ICA8ZXVzdGFzLmJ1Z0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogVGltZWxpbmU6IG5lc3QgdGltZS90aW1lRW5kIHJlY29yZHMgd2hlbiBwb3NzaWJs ZSAoaW4gZ2x1ZS1tb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TcGxpdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NwbGl0Vmlldy5qcwppbmRleCBhZGZjOTk2NzM5YzZhYzI2YWYzMzY3MTQ2MzYzZDhiYjg4MjY5 MmFmLi5mZThiYWFjMTI2NzNhMDVhMTViYWNiZWVkMjM2NDkxOTliNWM2ZjliIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcwpAQCAtMzEsNTEg KzMxLDEwMSBAQAogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICogQHBhcmFtIHti b29sZWFufSBpc1ZlcnRpY2FsCiAgKiBAcGFyYW0ge3N0cmluZz19IHNpZGViYXJTaXplU2V0dGlu Z05hbWUKLSAqIEBwYXJhbSB7bnVtYmVyPX0gZGVmYXVsdFNpZGViYXJTaXplCisgKiBAcGFyYW0g e251bWJlcj19IGRlZmF1bHRTaWRlYmFyV2lkdGgKKyAqIEBwYXJhbSB7bnVtYmVyPX0gZGVmYXVs dFNpZGViYXJIZWlnaHQKICAqLwotV2ViSW5zcGVjdG9yLlNwbGl0VmlldyA9IGZ1bmN0aW9uKGlz VmVydGljYWwsIHNpZGViYXJTaXplU2V0dGluZ05hbWUsIGRlZmF1bHRTaWRlYmFyU2l6ZSkKK1dl Ykluc3BlY3Rvci5TcGxpdFZpZXcgPSBmdW5jdGlvbihpc1ZlcnRpY2FsLCBzaWRlYmFyU2l6ZVNl dHRpbmdOYW1lLCBkZWZhdWx0U2lkZWJhcldpZHRoLCBkZWZhdWx0U2lkZWJhckhlaWdodCkKIHsK ICAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOwotICAgIHRoaXMuX2lzVmVydGljYWwg PSBpc1ZlcnRpY2FsOwogCiAgICAgdGhpcy5yZWdpc3RlclJlcXVpcmVkQ1NTKCJzcGxpdFZpZXcu Y3NzIik7CiAKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInNwbGl0LXZpZXciOwogCi0g ICAgdGhpcy5fZmlyc3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgdGhpcy5fZmlyc3RFbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3LWNvbnRlbnRzIHNw bGl0LXZpZXctY29udGVudHMtIiArIChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6ICJob3Jpem9u dGFsIik7Ci0gICAgaWYgKGlzVmVydGljYWwpCi0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5z dHlsZS5sZWZ0ID0gMDsKLSAgICBlbHNlCi0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHls ZS50b3AgPSAwOwotICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9maXJzdEVsZW1l bnQpOwotCi0gICAgdGhpcy5fc2Vjb25kRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuY2xhc3NOYW1lID0gInNwbGl0LXZpZXct Y29udGVudHMgc3BsaXQtdmlldy1jb250ZW50cy0iICsgKGlzVmVydGljYWwgPyAidmVydGljYWwi IDogImhvcml6b250YWwiKTsKLSAgICBpZiAoaXNWZXJ0aWNhbCkKLSAgICAgICAgdGhpcy5fc2Vj b25kRWxlbWVudC5zdHlsZS5yaWdodCA9IDA7Ci0gICAgZWxzZQotICAgICAgICB0aGlzLl9zZWNv bmRFbGVtZW50LnN0eWxlLmJvdHRvbSA9IDA7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3NlY29uZEVsZW1lbnQpOwotCi0gICAgdGhpcy5fcmVzaXplckVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5jbGFz c05hbWUgPSAic3BsaXQtdmlldy1yZXNpemVyIHNwbGl0LXZpZXctcmVzaXplci0iICsgKGlzVmVy dGljYWwgPyAidmVydGljYWwiIDogImhvcml6b250YWwiKTsKKyAgICB0aGlzLl9maXJzdEVsZW1l bnQgPSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJzcGxpdC12aWV3LWNvbnRlbnRz Iik7CisKKyAgICB0aGlzLl9zZWNvbmRFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxk KCJkaXYiLCAic3BsaXQtdmlldy1jb250ZW50cyIpOworCisgICAgdGhpcy5fcmVzaXplckVsZW1l bnQgPSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJzcGxpdC12aWV3LXJlc2l6ZXIi KTsKICAgICB0aGlzLmluc3RhbGxSZXNpemVyKHRoaXMuX3Jlc2l6ZXJFbGVtZW50KTsKICAgICB0 aGlzLl9yZXNpemFibGUgPSB0cnVlOwotICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9yZXNpemVyRWxlbWVudCk7CiAKLSAgICBkZWZhdWx0U2lkZWJhclNpemUgPSBkZWZhdWx0U2lk ZWJhclNpemUgfHwgMjAwOwotICAgIHRoaXMuX3NhdmVkU2lkZWJhclNpemUgPSBkZWZhdWx0U2lk ZWJhclNpemU7CisgICAgdGhpcy5fc2F2ZWRTaWRlYmFyV2lkdGggPSBkZWZhdWx0U2lkZWJhcldp ZHRoIHx8IDIwMDsKKyAgICB0aGlzLl9zYXZlZFNpZGViYXJIZWlnaHQgPSBkZWZhdWx0U2lkZWJh ckhlaWdodCB8fCB0aGlzLl9zYXZlZFNpZGViYXJXaWR0aDsKIAogICAgIHRoaXMuX3NpZGViYXJT aXplU2V0dGluZ05hbWUgPSBzaWRlYmFyU2l6ZVNldHRpbmdOYW1lOwotICAgIGlmICh0aGlzLl9z aWRlYmFyU2l6ZVNldHRpbmdOYW1lKQotICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3NbdGhp cy5fc2lkZWJhclNpemVTZXR0aW5nTmFtZV0gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRl U2V0dGluZyh0aGlzLl9zaWRlYmFyU2l6ZVNldHRpbmdOYW1lLCB1bmRlZmluZWQpOwogCiAgICAg dGhpcy5fc2Vjb25kSXNTaWRlYmFyID0gdHJ1ZTsKKworICAgIHRoaXMuX2lubmVyU2V0VmVydGlj YWwoaXNWZXJ0aWNhbCk7CiB9CiAKIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlID0g ewogICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNWZXJ0 aWNhbDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2lzVmVydGljYWw7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gaXNWZXJ0aWNhbAor ICAgICAqLworICAgIHNldFZlcnRpY2FsOiBmdW5jdGlvbihpc1ZlcnRpY2FsKQorICAgIHsKKyAg ICAgICAgaWYgKHRoaXMuX2lzVmVydGljYWwgPT09IGlzVmVydGljYWwpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5faW5uZXJTZXRWZXJ0aWNhbChpc1ZlcnRpY2FsKTsKKwor ICAgICAgICBpZiAodGhpcy5pc1Nob3dpbmcoKSkKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUxh eW91dCgpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGlzVmVy dGljYWwKKyAgICAgKi8KKyAgICBfaW5uZXJTZXRWZXJ0aWNhbDogZnVuY3Rpb24oaXNWZXJ0aWNh bCkKKyAgICB7CisgICAgICAgIHRoaXMuX2lzVmVydGljYWwgPSBpc1ZlcnRpY2FsOworCisgICAg ICAgIHRoaXMuX3JlbW92ZUFsbExheW91dFByb3BlcnRpZXMoKTsKKworICAgICAgICBpZiAoaXNW ZXJ0aWNhbCkgeworICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLmxlZnQgPSAw OworICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5yaWdodCA9IDA7CisgICAg ICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInRvcCIpOwor ICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiYm90 dG9tIik7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQu c3R5bGUudG9wID0gMDsKKyAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUuYm90 dG9tID0gMDsKKyAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5yZW1vdmVQcm9w ZXJ0eSgibGVmdCIpOworICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5yZW1v dmVQcm9wZXJ0eSgicmlnaHQiKTsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBvbGREaXJlY3Rp b24gPSAoaXNWZXJ0aWNhbCA/ICJob3Jpem9udGFsIiA6ICJ2ZXJ0aWNhbCIpOworICAgICAgICB2 YXIgbmV3RGlyZWN0aW9uID0gKGlzVmVydGljYWwgPyAidmVydGljYWwiIDogImhvcml6b250YWwi KTsKKworICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQt dmlldy1jb250ZW50cy0iICsgb2xkRGlyZWN0aW9uKTsKKyAgICAgICAgdGhpcy5fZmlyc3RFbGVt ZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtIiArIG5ld0RpcmVjdGlvbik7 CisKKyAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJzcGxpdC12 aWV3LWNvbnRlbnRzLSIgKyBvbGREaXJlY3Rpb24pOworICAgICAgICB0aGlzLl9zZWNvbmRFbGVt ZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtIiArIG5ld0RpcmVjdGlvbik7 CisKKyAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQt dmlldy1yZXNpemVyLSIgKyBvbGREaXJlY3Rpb24pOworICAgICAgICB0aGlzLl9yZXNpemVyRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXJlc2l6ZXItIiArIG5ld0RpcmVjdGlvbik7 CisgICAgfSwKKyAgCisgICAgX3VwZGF0ZUxheW91dDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy5fdXBkYXRlVG90YWxTaXplKCk7CisKKyAgICAgICAgZGVsZXRlIHRoaXMuX3NpZGVi YXJTaXplOyAgLy8gRm9yY2UgdXBkYXRlLgorICAgICAgICB0aGlzLnNldFNpZGViYXJTaXplKHRo aXMuX2xhc3RTaWRlYmFyU2l6ZSgpKTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHJldHVy biB7RWxlbWVudH0KICAgICAgKi8KICAgICBmaXJzdEVsZW1lbnQ6IGZ1bmN0aW9uKCkKQEAgLTky LDYgKzE0MiwxNCBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KKyAgICAgKi8KKyAgICBpc1Np ZGViYXJTZWNvbmQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zZWNv bmRJc1NpZGViYXI7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0g c2Vjb25kSXNTaWRlYmFyCiAgICAgICovCiAgICAgc2V0U2Vjb25kSXNTaWRlYmFyOiBmdW5jdGlv bihzZWNvbmRJc1NpZGViYXIpCkBAIC0xNTUsNiArMjEzLDExIEBAIFdlYkluc3BlY3Rvci5TcGxp dFZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLnJl bW92ZVByb3BlcnR5KCJ0b3AiKTsKICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5y ZW1vdmVQcm9wZXJ0eSgid2lkdGgiKTsKICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHls ZS5yZW1vdmVQcm9wZXJ0eSgiaGVpZ2h0Iik7CisKKyAgICAgICAgdGhpcy5fcmVzaXplckVsZW1l bnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImxlZnQiKTsKKyAgICAgICAgdGhpcy5fcmVzaXplckVs ZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInJpZ2h0Iik7CisgICAgICAgIHRoaXMuX3Jlc2l6 ZXJFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ0b3AiKTsKKyAgICAgICAgdGhpcy5fcmVz aXplckVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImJvdHRvbSIpOwogICAgIH0sCiAKICAg ICBzaG93Qm90aDogZnVuY3Rpb24oKQpAQCAtMTY1LDkgKzIyOCw3IEBAIFdlYkluc3BlY3Rvci5T cGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnJlbW92 ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnJlbW92 ZVN0eWxlQ2xhc3MoIm1heGltaXplZCIpOwogCi0gICAgICAgIC8vIEZvcmNlIHVwZGF0ZQotICAg ICAgICBkZWxldGUgdGhpcy5fc2lkZWJhclNpemU7Ci0gICAgICAgIHRoaXMuc2V0U2lkZWJhclNp emUodGhpcy5fbGFzdFNpZGViYXJTaXplKCkpOworICAgICAgICB0aGlzLl91cGRhdGVMYXlvdXQo KTsKIAogICAgICAgICB0aGlzLnNldFJlc2l6YWJsZSh0cnVlKTsKICAgICAgICAgdGhpcy5kb1Jl c2l6ZSgpOwpAQCAtMjE2LDYgKzI3NywxMSBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3RvdGFsU2l6ZTsKICAgICB9LAogCisgICAg X3VwZGF0ZVRvdGFsU2l6ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdG90YWxT aXplID0gdGhpcy5faXNWZXJ0aWNhbCA/IHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aCA6IHRoaXMu ZWxlbWVudC5vZmZzZXRIZWlnaHQ7CisgICAgfSwKKyAgCiAgICAgLyoqCiAgICAgICogQHBhcmFt IHtudW1iZXJ9IHNpemUKICAgICAgKi8KQEAgLTIzMywyMCArMjk5LDIwIEBAIFdlYkluc3BlY3Rv ci5TcGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3NlY29uZEVs ZW1lbnQuc3R5bGUud2lkdGggPSBzaXplICsgInB4IjsKICAgICAgICAgICAgICAgICB0aGlzLl9y ZXNpemVyRWxlbWVudC5zdHlsZS5yaWdodCA9IHNpemUgLSByZXNpemVyV2lkdGggLyAyICsgInB4 IjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVt ZW50LnN0eWxlLndpZHRoID0gc2l6ZSArICJweCI7OwotICAgICAgICAgICAgICAgIHRoaXMuX3Nl Y29uZEVsZW1lbnQuc3R5bGUubGVmdCA9IHNpemUgKyAicHgiOzsKKyAgICAgICAgICAgICAgICB0 aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUud2lkdGggPSBzaXplICsgInB4IjsKKyAgICAgICAgICAg ICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmxlZnQgPSBzaXplICsgInB4IjsKICAgICAg ICAgICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5sZWZ0ID0gc2l6ZSAtIHJlc2l6 ZXJXaWR0aCAvIDIgKyAicHgiOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgdmFyIHJlc2l6ZXJIZWlnaHQgPSB0aGlzLl9yZXNpemVyRWxlbWVudC5vZmZzZXRI ZWlnaHQ7CiAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKHRoaXMuX3NlY29uZElzU2lkZWJh cikgewotICAgICAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5ib3R0b20gPSBz aXplICsgInB4Ijs7Ci0gICAgICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5o ZWlnaHQgPSBzaXplICsgInB4Ijs7CisgICAgICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50 LnN0eWxlLmJvdHRvbSA9IHNpemUgKyAicHgiOworICAgICAgICAgICAgICAgIHRoaXMuX3NlY29u ZEVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gc2l6ZSArICJweCI7CiAgICAgICAgICAgICAgICAgdGhp cy5fcmVzaXplckVsZW1lbnQuc3R5bGUuYm90dG9tID0gc2l6ZSAtIHJlc2l6ZXJIZWlnaHQgLyAy ICsgInB4IjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZmly c3RFbGVtZW50LnN0eWxlLmhlaWdodCA9IHNpemUgKyAicHgiOzsKLSAgICAgICAgICAgICAgICB0 aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLnRvcCA9IHNpemUgKyAicHgiOzsKKyAgICAgICAgICAg ICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gc2l6ZSArICJweCI7CisgICAg ICAgICAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS50b3AgPSBzaXplICsgInB4IjsK ICAgICAgICAgICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS50b3AgPSBzaXplIC0g cmVzaXplckhlaWdodCAvIDIgKyAicHgiOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC0y NzAsMTQgKzMzNiwxMiBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKIAog ICAgIHdhc1Nob3duOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl90b3RhbFNpemUg PSB0aGlzLl9pc1ZlcnRpY2FsID8gdGhpcy5lbGVtZW50Lm9mZnNldFdpZHRoIDogdGhpcy5lbGVt ZW50Lm9mZnNldEhlaWdodDsKLSAgICAgICAgdGhpcy5zZXRTaWRlYmFyU2l6ZSh0aGlzLl9sYXN0 U2lkZWJhclNpemUoKSk7CisgICAgICAgIHRoaXMuX3VwZGF0ZUxheW91dCgpOwogICAgIH0sCiAK ICAgICBvblJlc2l6ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIG9sZFRvdGFsU2l6 ZSA9IHRoaXMuX3RvdGFsU2l6ZTsKLSAgICAgICAgdGhpcy5fdG90YWxTaXplID0gdGhpcy5faXNW ZXJ0aWNhbCA/IHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aCA6IHRoaXMuZWxlbWVudC5vZmZzZXRI ZWlnaHQ7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRvdGFsU2l6ZSgpOwogICAgIH0sCiAKICAgICAv KioKQEAgLTMxNyw3ICszODEsMzEgQEAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUg PSB7CiAgICAgICovCiAgICAgaW5zdGFsbFJlc2l6ZXI6IGZ1bmN0aW9uKHJlc2l6ZXJFbGVtZW50 KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmluc3RhbGxEcmFnSGFuZGxlKHJlc2l6ZXJF bGVtZW50LCB0aGlzLl9zdGFydFJlc2l6ZXJEcmFnZ2luZy5iaW5kKHRoaXMpLCB0aGlzLl9yZXNp emVyRHJhZ2dpbmcuYmluZCh0aGlzKSwgdGhpcy5fZW5kUmVzaXplckRyYWdnaW5nLmJpbmQodGhp cyksIHRoaXMuX2lzVmVydGljYWwgPyAiZXctcmVzaXplIiA6ICJucy1yZXNpemUiKTsKKyAgICAg ICAgcmVzaXplckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fb25E cmFnU3RhcnQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKgor ICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX29uRHJhZ1N0YXJ0OiBm dW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5fZWxlbWVudERyYWdT dGFydCh0aGlzLl9zdGFydFJlc2l6ZXJEcmFnZ2luZy5iaW5kKHRoaXMpLCB0aGlzLl9yZXNpemVy RHJhZ2dpbmcuYmluZCh0aGlzKSwgdGhpcy5fZW5kUmVzaXplckRyYWdnaW5nLmJpbmQodGhpcyks IHRoaXMuX2lzVmVydGljYWwgPyAiZXctcmVzaXplIiA6ICJucy1yZXNpemUiLCBldmVudCk7Cisg ICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5TZXR0aW5nfQor ICAgICAqLworICAgIF9zaXplU2V0dGluZzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYg KCF0aGlzLl9zaWRlYmFyU2l6ZVNldHRpbmdOYW1lKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7 CisKKyAgICAgICAgdmFyIHNldHRpbmdOYW1lID0gdGhpcy5fc2lkZWJhclNpemVTZXR0aW5nTmFt ZSArICh0aGlzLl9pc1ZlcnRpY2FsID8gIiIgOiAiSCIpOworICAgICAgICBpZiAoIVdlYkluc3Bl Y3Rvci5zZXR0aW5nc1tzZXR0aW5nTmFtZV0pCisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0 dGluZ3Nbc2V0dGluZ05hbWVdID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLmNyZWF0ZVNldHRpbmco c2V0dGluZ05hbWUsIHVuZGVmaW5lZCk7CisKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5z ZXR0aW5nc1tzZXR0aW5nTmFtZV07CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMzI1LDcgKzQxMyw5 IEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9s YXN0U2lkZWJhclNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9z aWRlYmFyU2l6ZVNldHRpbmdOYW1lID8gV2ViSW5zcGVjdG9yLnNldHRpbmdzW3RoaXMuX3NpZGVi YXJTaXplU2V0dGluZ05hbWVdLmdldCgpIHx8IHRoaXMuX3NhdmVkU2lkZWJhclNpemUgOiB0aGlz Ll9zYXZlZFNpZGViYXJTaXplOworICAgICAgICB2YXIgc2l6ZVNldHRpbmcgPSB0aGlzLl9zaXpl U2V0dGluZygpOworICAgICAgICB2YXIgc2l6ZSA9IHNpemVTZXR0aW5nID8gc2l6ZVNldHRpbmcu Z2V0KCkgOiAwOworICAgICAgICByZXR1cm4gc2l6ZSB8fCAodGhpcy5faXNWZXJ0aWNhbCA/IHRo aXMuX3NhdmVkU2lkZWJhcldpZHRoIDogdGhpcy5fc2F2ZWRTaWRlYmFySGVpZ2h0KTsKICAgICB9 LAogCiAgICAgLyoqCkBAIC0zMzMsMTEgKzQyMywxNCBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfc2F2ZVNpZGViYXJTaXplOiBmdW5jdGlvbihz aXplKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2F2ZWRTaWRlYmFyU2l6ZSA9IHNpemU7Ci0gICAg ICAgIGlmICghdGhpcy5fc2lkZWJhclNpemVTZXR0aW5nTmFtZSkKLSAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgaWYgKHRoaXMuX2lzVmVydGljYWwpCisgICAgICAgICAgICB0aGlzLl9zYXZl ZFNpZGViYXJXaWR0aCA9IHNpemU7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3Nh dmVkU2lkZWJhckhlaWdodCA9IHNpemU7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdz W3RoaXMuX3NpZGViYXJTaXplU2V0dGluZ05hbWVdLnNldCh0aGlzLl9zYXZlZFNpZGViYXJTaXpl KTsKKyAgICAgICAgdmFyIHNpemVTZXR0aW5nID0gdGhpcy5fc2l6ZVNldHRpbmcoKTsKKyAgICAg ICAgaWYgKHNpemVTZXR0aW5nKQorICAgICAgICAgICAgc2l6ZVNldHRpbmcuc2V0KHNpemUpOwog ICAgIH0sCiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQo=