55238 2011-02-25 11:10:44 -0800 Web Inspector: Resizing columns in the network panel is weird 2011-05-19 11:15:19 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dev+webkit webkit-unassigned apavlov bweinstein commit-queue joepeck keishi loislo pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 358055 0 dev+webkit 2011-02-25 11:10:44 -0800 Resizing the columns in the Network panel is weird. Resizing a column only changes the amount of space between the columns on either side of the resizer instead of adjusting the whole tableview (the behavior of native TableViews on OS X). For example, this makes is really hard to resize the Name column to see the full names of long resources. I don't remember if this is how tableviews behave on Windows and don't have a machine handy to test, but we should match the host platform's behavior if that's the case. 405961 1 93971 tonistiigi 2011-05-18 12:50:20 -0700 Created attachment 93971 Patch Includes resizing methods: nearest, last and first. Native NSTableView also has sequential an reverse sequential(that probably have the best effect) but adding those would mean adding minimum and maximum width ranges to columns instead of single fixed values. 405963 2 webkit.review.bot 2011-05-18 12:53:13 -0700 Attachment 93971 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 405969 3 93973 tonistiigi 2011-05-18 13:00:51 -0700 Created attachment 93973 Patch 405972 4 webkit.review.bot 2011-05-18 13:02:41 -0700 Attachment 93973 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 405974 5 93976 tonistiigi 2011-05-18 13:08:10 -0700 Created attachment 93976 Pathc 406331 6 93976 pfeldman 2011-05-19 04:32:00 -0700 Comment on attachment 93976 Pathc View in context: https://bugs.webkit.org/attachment.cgi?id=93976&action=review There is a series of style nits, but otherwise looks good. Thanks for fixing this! > Source/WebCore/inspector/front-end/DataGrid.js:927 > + if (typeof this._resizeMethod==="undefined") Nit: this should be: typeof this._resizeMethod === "undefined" > Source/WebCore/inspector/front-end/DataGrid.js:965 > + if(this.resizeMethod==WebInspector.DataGrid.ResizeMethod.Last) Spaces around == and before ( as well. > Source/WebCore/inspector/front-end/DataGrid.js:966 > + { Style for if is if (foo === bar) { ... } > Source/WebCore/inspector/front-end/DataGrid.js:969 > + else if(this.resizeMethod==WebInspector.DataGrid.ResizeMethod.First) ditto > Source/WebCore/inspector/front-end/DataGrid.js:971 > + leftEdgeOfPreviousColumn+=firstRowCells[leftCellIndex].offsetWidth - firstRowCells[0].offsetWidth; Spaces around += are missing. > Source/WebCore/inspector/front-end/DataGrid.js:1011 > + Nearest: 'nearest', No need to align values into a column. Please use " instead of ' 406411 7 94071 tonistiigi 2011-05-19 08:30:35 -0700 Created attachment 94071 Patch with style fixes 406516 8 94071 pfeldman 2011-05-19 10:47:43 -0700 Comment on attachment 94071 Patch with style fixes View in context: https://bugs.webkit.org/attachment.cgi?id=94071&action=review It looks good now, thanks. One nit you don't have to fix since it is minor + would require re-review. I am marking this change as cq+ which means it'll land automatically. > Source/WebCore/inspector/front-end/DataGrid.js:965 > + if (this.resizeMethod == WebInspector.DataGrid.ResizeMethod.Last) { Nit: single liners do not need {} 406530 9 94071 commit-queue 2011-05-19 11:15:13 -0700 Comment on attachment 94071 Patch with style fixes Clearing flags on attachment: 94071 Committed r86855: <http://trac.webkit.org/changeset/86855> 406532 10 commit-queue 2011-05-19 11:15:19 -0700 All reviewed patches have been landed. Closing bug. 93971 2011-05-18 12:50:20 -0700 2011-05-18 13:00:51 -0700 Patch network_panel_column_resizing.patch text/plain 5992 tonistiigi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGQ0MTQ3Li5hOGZlMWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTggIFTDtW5pcyBUaWlnaSAgPHRvbmlzdGlpZ2lAZ21haWwuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCQorICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZXNpemluZyBjb2x1bW5zIGluIHRoZSBuZXR3b3JrIHBhbmVsIGlzIHdlaXJkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTIzOAorCisgICAg ICAgIE1ha2VzIG5ldHdvcmsgcGFuZWwgY29sdW1uIHJlc2l6aW5nIG1vcmUgdXNhYmxlIGJ5IGFk ZGluZyAiZmlyc3Qgb25seSIgYW5kICJsYXN0IG9ubHkiCisJcmVzaXppbmcgbWV0aG9kcyB0byBX ZWJJbnNwZWN0b3IuRGF0YUdyaWQuIEN1cnJlbnQgYmVoYXZpb3IgaXMgbmFtZWQgIm5lYXJlc3Qi IGFuZAorCXJlbWFpbnMgZGVmYXVsdC4gTmV0d29yayBwYW5lbHMgZGF0YWdyaWQgaXMgc2V0IHRv IHVzZSBtZXRob2QgImxhc3QiLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRh R3JpZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuZ2V0IHJl c2l6ZU1ldGhvZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLnNl dCByZXNpemVNZXRob2QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlw ZS5fcmVzaXplckRyYWdnaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBl Ll9jcmVhdGVUYWJsZSk6CisKIDIwMTEtMDUtMTggIEV2YW4gTWFydGluICA8ZXZhbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCmluZGV4IDdkNzEwOWEuLjRhODcx NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdy aWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5q cwpAQCAtOTIyLDYgKzkyMiwxOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0g ewogICAgICAgICB9CiAgICAgfSwKICAgICAKKyAgICBnZXQgcmVzaXplTWV0aG9kKCkKKyAgICB7 CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fcmVzaXplTWV0aG9kPT09InVuZGVmaW5lZCIpCisg ICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6ZU1ldGhvZC5OZWFy ZXN0OworICAgICAgICByZXR1cm4gdGhpcy5fcmVzaXplTWV0aG9kOworICAgIH0sCisKKyAgICBz ZXQgcmVzaXplTWV0aG9kKG1ldGhvZCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Jlc2l6ZU1ldGhv ZCA9IG1ldGhvZDsKKyAgICB9LAorICAgIAogICAgIF9zdGFydFJlc2l6ZXJEcmFnZ2luZzogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLmN1cnJlbnRSZXNpemVyID0gZXZlbnQu dGFyZ2V0OwpAQCAtOTQyLDEzICs5NTQsMjYgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdmFyIGRyYWdQb2ludCA9IGV2ZW50LmNsaWVudFggLSB0aGlzLmVs ZW1lbnQudG90YWxPZmZzZXRMZWZ0OwogICAgICAgICAvLyBDb25zdHJhaW4gdGhlIGRyYWdwb2lu dCB0byBiZSB3aXRoaW4gdGhlIHNwYWNlIG1hZGUgdXAgYnkgdGhlCiAgICAgICAgIC8vIGNvbHVt biBkaXJlY3RseSB0byB0aGUgbGVmdCBhbmQgdGhlIGNvbHVtbiBkaXJlY3RseSB0byB0aGUgcmln aHQuCi0gICAgICAgIHZhciBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gPSAwOworICAgICAgICB2 YXIgbGVmdENlbGxJbmRleCA9IHJlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29sdW1uSUQ7CisgICAg ICAgIHZhciByaWdodENlbGxJbmRleCA9IHJlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklE OwogICAgICAgICB2YXIgZmlyc3RSb3dDZWxscyA9IHRoaXMuaGVhZGVyVGFibGVCb2R5LnJvd3Nb MF0uY2VsbHM7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzaXplci5sZWZ0TmVpZ2hi b3JpbmdDb2x1bW5JRDsgaSsrKQorICAgICAgICB2YXIgbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1u ID0gMDsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsZWZ0Q2VsbEluZGV4OyBpKyspCiAg ICAgICAgICAgICBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKz0gZmlyc3RSb3dDZWxsc1tpXS5v ZmZzZXRXaWR0aDsKLSAgICAgICAgICAgIAotICAgICAgICB2YXIgcmlnaHRFZGdlT2ZOZXh0Q29s dW1uID0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICsgZmlyc3RSb3dDZWxsc1tyZXNpemVyLmxl ZnROZWlnaGJvcmluZ0NvbHVtbklEXS5vZmZzZXRXaWR0aCArIGZpcnN0Um93Q2VsbHNbcmVzaXpl ci5yaWdodE5laWdoYm9yaW5nQ29sdW1uSURdLm9mZnNldFdpZHRoOwotCisgICAgICAgIAorICAg ICAgICAvLyBEaWZmZXJlbmNlcyBmb3Igb3RoZXIgcmVzaXplIG1ldGhvZHMKKyAgICAgICAgaWYo dGhpcy5yZXNpemVNZXRob2Q9PVdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuTGFz dCkKKyAgICAgICAgeworICAgICAgICAgICAgcmlnaHRDZWxsSW5kZXggPSB0aGlzLnJlc2l6ZXJz Lmxlbmd0aDsKKyAgICAgICAgfQorICAgICAgICBlbHNlIGlmKHRoaXMucmVzaXplTWV0aG9kPT1X ZWJJbnNwZWN0b3IuRGF0YUdyaWQuUmVzaXplTWV0aG9kLkZpcnN0KQorICAgICAgICB7CisgICAg ICAgICAgICBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4rPWZpcnN0Um93Q2VsbHNbbGVmdENlbGxJ bmRleF0ub2Zmc2V0V2lkdGggLSBmaXJzdFJvd0NlbGxzWzBdLm9mZnNldFdpZHRoOworICAgICAg ICAgICAgbGVmdENlbGxJbmRleCA9IDA7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIHZh ciByaWdodEVkZ2VPZk5leHRDb2x1bW4gPSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKyBmaXJz dFJvd0NlbGxzW2xlZnRDZWxsSW5kZXhdLm9mZnNldFdpZHRoICsgZmlyc3RSb3dDZWxsc1tyaWdo dENlbGxJbmRleF0ub2Zmc2V0V2lkdGg7CisgICAgICAgIAogICAgICAgICAvLyBHaXZlIGVhY2gg Y29sdW1uIHNvbWUgcGFkZGluZyBzbyB0aGF0IHRoZXkgZG9uJ3QgZGlzYXBwZWFyLgogICAgICAg ICB2YXIgbGVmdE1pbmltdW0gPSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKyB0aGlzLkNvbHVt blJlc2l6ZVBhZGRpbmc7CiAgICAgICAgIHZhciByaWdodE1heGltdW0gPSByaWdodEVkZ2VPZk5l eHRDb2x1bW4gLSB0aGlzLkNvbHVtblJlc2l6ZVBhZGRpbmc7CkBAIC05NTgsMTIgKzk4MywxMiBA QCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICByZXNpemVyLnN0 eWxlLmxlZnQgPSAoZHJhZ1BvaW50IC0gdGhpcy5DZW50ZXJSZXNpemVyT3ZlckJvcmRlckFkanVz dG1lbnQpICsgInB4IjsKIAogICAgICAgICB2YXIgcGVyY2VudExlZnRDb2x1bW4gPSAoKChkcmFn UG9pbnQgLSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4pIC8gdGhpcy5fZGF0YVRhYmxlLm9mZnNl dFdpZHRoKSAqIDEwMCkgKyAiJSI7Ci0gICAgICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3Jv dXAuY2hpbGRyZW5bcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRF0uc3R5bGUud2lkdGgg PSBwZXJjZW50TGVmdENvbHVtbjsKLSAgICAgICAgdGhpcy5fZGF0YVRhYmxlQ29sdW1uR3JvdXAu Y2hpbGRyZW5bcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRF0uc3R5bGUud2lkdGggPSBw ZXJjZW50TGVmdENvbHVtbjsKKyAgICAgICAgdGhpcy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cC5j aGlsZHJlbltsZWZ0Q2VsbEluZGV4XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1uOwor ICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltsZWZ0Q2VsbEluZGV4 XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1uOwogCiAgICAgICAgIHZhciBwZXJjZW50 UmlnaHRDb2x1bW4gPSAoKChyaWdodEVkZ2VPZk5leHRDb2x1bW4gLSBkcmFnUG9pbnQpIC8gdGhp cy5fZGF0YVRhYmxlLm9mZnNldFdpZHRoKSAqIDEwMCkgKyAiJSI7Ci0gICAgICAgIHRoaXMuX2hl YWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5yaWdodE5laWdoYm9yaW5nQ29s dW1uSURdLnN0eWxlLndpZHRoID0gIHBlcmNlbnRSaWdodENvbHVtbjsKLSAgICAgICAgdGhpcy5f ZGF0YVRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5yaWdodE5laWdoYm9yaW5nQ29s dW1uSURdLnN0eWxlLndpZHRoID0gcGVyY2VudFJpZ2h0Q29sdW1uOworICAgICAgICB0aGlzLl9o ZWFkZXJUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW3JpZ2h0Q2VsbEluZGV4XS5zdHlsZS53aWR0 aCA9ICBwZXJjZW50UmlnaHRDb2x1bW47CisgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdy b3VwLmNoaWxkcmVuW3JpZ2h0Q2VsbEluZGV4XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRSaWdodENv bHVtbjsKIAogICAgICAgICB0aGlzLl9wb3NpdGlvblJlc2l6ZXJzKCk7CiAgICAgICAgIGV2ZW50 LnByZXZlbnREZWZhdWx0KCk7CkBAIC05ODIsNiArMTAwNywxMiBAQCBXZWJJbnNwZWN0b3IuRGF0 YUdyaWQucHJvdG90eXBlID0gewogICAgIENlbnRlclJlc2l6ZXJPdmVyQm9yZGVyQWRqdXN0bWVu dDogMywKIH0KIAorV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6ZU1ldGhvZCA9IHsKKyAgICBO ZWFyZXN0OiAgICAnbmVhcmVzdCcsCisgICAgRmlyc3Q6ICAgICAgJ2ZpcnN0JywKKyAgICBMYXN0 OiAgICAgICAnbGFzdCcKK30KKwogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9yLkRh dGFHcmlkTm9kZSA9IGZ1bmN0aW9uKGRhdGEsIGhhc0NoaWxkcmVuKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCA1NDExM2Rj Li43MWJlZGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwpAQCAtMTg1LDYgKzE4NSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBjb2x1bW5zLnRpbWVsaW5lLnNvcnQgPSAiYXNj ZW5kaW5nIjsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0 YUdyaWQoY29sdW1ucyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2l6ZU1ldGhvZCA9IFdl Ykluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuTGFzdDsKICAgICAgICAgdGhpcy5fZGF0 YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2NvbnRl eHRNZW51LmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICB0aGlzLmNvbnRhaW5lckVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CiAgICAgICAgIHRoaXMuX2RhdGFH cmlkLmFkZEV2ZW50TGlzdGVuZXIoInNvcnRpbmcgY2hhbmdlZCIsIHRoaXMuX3NvcnRJdGVtcywg dGhpcyk7Cg== 93973 2011-05-18 13:00:51 -0700 2011-05-18 13:08:10 -0700 Patch network_panel_column_resizing2.patch text/plain 6006 tonistiigi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGQ0MTQ3Li5kMzVmYTZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDExLTA1LTE4ICBUb25pcyBUaWlnaSAgPHRvbmlzdGlpZ2lAZ21haWwuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCQorICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZXNpemluZyBjb2x1bW5zIGluIHRoZSBuZXR3b3JrIHBhbmVsIGlzIHdlaXJkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTIzOAorCisgICAg ICAgIE1ha2VzIG5ldHdvcmsgcGFuZWwgY29sdW1uIHJlc2l6aW5nIG1vcmUgdXNhYmxlIGJ5IGFk ZGluZyAiZmlyc3Qgb25seSIgYW5kICJsYXN0IG9ubHkiCisgICAgICAgIHJlc2l6aW5nIG1ldGhv ZHMgdG8gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLiBDdXJyZW50IGJlaGF2aW9yIGlzIG5hbWVkICJu ZWFyZXN0IiBhbmQKKyAgICAgICAgcmVtYWlucyBkZWZhdWx0LiBOZXR3b3JrIHBhbmVscyBkYXRh Z3JpZCBpcyBzZXQgdG8gdXNlIG1ldGhvZCAibGFzdCIuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZS5nZXQgcmVzaXplTWV0aG9kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5wcm90b3R5cGUuc2V0IHJlc2l6ZU1ldGhvZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0 YUdyaWQucHJvdG90eXBlLl9yZXNpemVyRHJhZ2dpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQ YW5lbC5wcm90b3R5cGUuX2NyZWF0ZVRhYmxlKToKKwogMjAxMS0wNS0xOCAgRXZhbiBNYXJ0aW4g IDxldmFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKaW5kZXgg N2Q3MTA5YS4uNGE4NzE3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RhdGFHcmlkLmpzCkBAIC05MjIsNiArOTIyLDE4IEBAIFdlYkluc3BlY3Rvci5EYXRhR3Jp ZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogICAgIAorICAgIGdldCByZXNpemVN ZXRob2QoKQorICAgIHsKKyAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9yZXNpemVNZXRob2Q9PT0i dW5kZWZpbmVkIikKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuUmVz aXplTWV0aG9kLk5lYXJlc3Q7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXNpemVNZXRob2Q7Cisg ICAgfSwKKworICAgIHNldCByZXNpemVNZXRob2QobWV0aG9kKQorICAgIHsKKyAgICAgICAgdGhp cy5fcmVzaXplTWV0aG9kID0gbWV0aG9kOworICAgIH0sCisgICAgCiAgICAgX3N0YXJ0UmVzaXpl ckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuY3VycmVudFJl c2l6ZXIgPSBldmVudC50YXJnZXQ7CkBAIC05NDIsMTMgKzk1NCwyNiBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZHJhZ1BvaW50ID0gZXZlbnQuY2xp ZW50WCAtIHRoaXMuZWxlbWVudC50b3RhbE9mZnNldExlZnQ7CiAgICAgICAgIC8vIENvbnN0cmFp biB0aGUgZHJhZ3BvaW50IHRvIGJlIHdpdGhpbiB0aGUgc3BhY2UgbWFkZSB1cCBieSB0aGUKICAg ICAgICAgLy8gY29sdW1uIGRpcmVjdGx5IHRvIHRoZSBsZWZ0IGFuZCB0aGUgY29sdW1uIGRpcmVj dGx5IHRvIHRoZSByaWdodC4KLSAgICAgICAgdmFyIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiA9 IDA7CisgICAgICAgIHZhciBsZWZ0Q2VsbEluZGV4ID0gcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdD b2x1bW5JRDsKKyAgICAgICAgdmFyIHJpZ2h0Q2VsbEluZGV4ID0gcmVzaXplci5yaWdodE5laWdo Ym9yaW5nQ29sdW1uSUQ7CiAgICAgICAgIHZhciBmaXJzdFJvd0NlbGxzID0gdGhpcy5oZWFkZXJU YWJsZUJvZHkucm93c1swXS5jZWxsczsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNp emVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklEOyBpKyspCisgICAgICAgIHZhciBsZWZ0RWRnZU9m UHJldmlvdXNDb2x1bW4gPSAwOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlZnRDZWxs SW5kZXg7IGkrKykKICAgICAgICAgICAgIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiArPSBmaXJz dFJvd0NlbGxzW2ldLm9mZnNldFdpZHRoOwotICAgICAgICAgICAgCi0gICAgICAgIHZhciByaWdo dEVkZ2VPZk5leHRDb2x1bW4gPSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKyBmaXJzdFJvd0Nl bGxzW3Jlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29sdW1uSURdLm9mZnNldFdpZHRoICsgZmlyc3RS b3dDZWxsc1tyZXNpemVyLnJpZ2h0TmVpZ2hib3JpbmdDb2x1bW5JRF0ub2Zmc2V0V2lkdGg7Ci0K KyAgICAgICAgCisgICAgICAgIC8vIERpZmZlcmVuY2VzIGZvciBvdGhlciByZXNpemUgbWV0aG9k cworICAgICAgICBpZih0aGlzLnJlc2l6ZU1ldGhvZD09V2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJl c2l6ZU1ldGhvZC5MYXN0KQorICAgICAgICB7CisgICAgICAgICAgICByaWdodENlbGxJbmRleCA9 IHRoaXMucmVzaXplcnMubGVuZ3RoOworICAgICAgICB9CisgICAgICAgIGVsc2UgaWYodGhpcy5y ZXNpemVNZXRob2Q9PVdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuRmlyc3QpCisg ICAgICAgIHsKKyAgICAgICAgICAgIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbis9Zmlyc3RSb3dD ZWxsc1tsZWZ0Q2VsbEluZGV4XS5vZmZzZXRXaWR0aCAtIGZpcnN0Um93Q2VsbHNbMF0ub2Zmc2V0 V2lkdGg7CisgICAgICAgICAgICBsZWZ0Q2VsbEluZGV4ID0gMDsKKyAgICAgICAgfQorICAgICAg ICAKKyAgICAgICAgdmFyIHJpZ2h0RWRnZU9mTmV4dENvbHVtbiA9IGxlZnRFZGdlT2ZQcmV2aW91 c0NvbHVtbiArIGZpcnN0Um93Q2VsbHNbbGVmdENlbGxJbmRleF0ub2Zmc2V0V2lkdGggKyBmaXJz dFJvd0NlbGxzW3JpZ2h0Q2VsbEluZGV4XS5vZmZzZXRXaWR0aDsKKyAgICAgICAgCiAgICAgICAg IC8vIEdpdmUgZWFjaCBjb2x1bW4gc29tZSBwYWRkaW5nIHNvIHRoYXQgdGhleSBkb24ndCBkaXNh cHBlYXIuCiAgICAgICAgIHZhciBsZWZ0TWluaW11bSA9IGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVt biArIHRoaXMuQ29sdW1uUmVzaXplUGFkZGluZzsKICAgICAgICAgdmFyIHJpZ2h0TWF4aW11bSA9 IHJpZ2h0RWRnZU9mTmV4dENvbHVtbiAtIHRoaXMuQ29sdW1uUmVzaXplUGFkZGluZzsKQEAgLTk1 OCwxMiArOTgzLDEyIEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHJlc2l6ZXIuc3R5bGUubGVmdCA9IChkcmFnUG9pbnQgLSB0aGlzLkNlbnRlclJlc2l6ZXJP dmVyQm9yZGVyQWRqdXN0bWVudCkgKyAicHgiOwogCiAgICAgICAgIHZhciBwZXJjZW50TGVmdENv bHVtbiA9ICgoKGRyYWdQb2ludCAtIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbikgLyB0aGlzLl9k YXRhVGFibGUub2Zmc2V0V2lkdGgpICogMTAwKSArICIlIjsKLSAgICAgICAgdGhpcy5faGVhZGVy VGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklE XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1uOwotICAgICAgICB0aGlzLl9kYXRhVGFi bGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklEXS5z dHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1uOworICAgICAgICB0aGlzLl9oZWFkZXJUYWJs ZUNvbHVtbkdyb3VwLmNoaWxkcmVuW2xlZnRDZWxsSW5kZXhdLnN0eWxlLndpZHRoID0gcGVyY2Vu dExlZnRDb2x1bW47CisgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVu W2xlZnRDZWxsSW5kZXhdLnN0eWxlLndpZHRoID0gcGVyY2VudExlZnRDb2x1bW47CiAKICAgICAg ICAgdmFyIHBlcmNlbnRSaWdodENvbHVtbiA9ICgoKHJpZ2h0RWRnZU9mTmV4dENvbHVtbiAtIGRy YWdQb2ludCkgLyB0aGlzLl9kYXRhVGFibGUub2Zmc2V0V2lkdGgpICogMTAwKSArICIlIjsKLSAg ICAgICAgdGhpcy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLnJpZ2h0 TmVpZ2hib3JpbmdDb2x1bW5JRF0uc3R5bGUud2lkdGggPSAgcGVyY2VudFJpZ2h0Q29sdW1uOwot ICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLnJpZ2h0 TmVpZ2hib3JpbmdDb2x1bW5JRF0uc3R5bGUud2lkdGggPSBwZXJjZW50UmlnaHRDb2x1bW47Cisg ICAgICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxsSW5k ZXhdLnN0eWxlLndpZHRoID0gIHBlcmNlbnRSaWdodENvbHVtbjsKKyAgICAgICAgdGhpcy5fZGF0 YVRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmlnaHRDZWxsSW5kZXhdLnN0eWxlLndpZHRoID0g cGVyY2VudFJpZ2h0Q29sdW1uOwogCiAgICAgICAgIHRoaXMuX3Bvc2l0aW9uUmVzaXplcnMoKTsK ICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKQEAgLTk4Miw2ICsxMDA3LDEyIEBAIFdl Ykluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgQ2VudGVyUmVzaXplck92ZXJC b3JkZXJBZGp1c3RtZW50OiAzLAogfQogCitXZWJJbnNwZWN0b3IuRGF0YUdyaWQuUmVzaXplTWV0 aG9kID0geworICAgIE5lYXJlc3Q6ICAgICduZWFyZXN0JywKKyAgICBGaXJzdDogICAgICAnZmly c3QnLAorICAgIExhc3Q6ICAgICAgICdsYXN0JworfQorCiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwogCiBX ZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gZnVuY3Rpb24oZGF0YSwgaGFzQ2hpbGRyZW4pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CmluZGV4IDU0MTEzZGMuLjcxYmVkZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC0xODUsNiArMTg1LDcgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbHVtbnMudGltZWxp bmUuc29ydCA9ICJhc2NlbmRpbmciOwogCiAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gbmV3IFdl Ykluc3BlY3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQucmVz aXplTWV0aG9kID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6ZU1ldGhvZC5MYXN0OwogICAg ICAgICB0aGlzLl9kYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51 IiwgdGhpcy5fY29udGV4dE1lbnUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAgIHRoaXMuY29u dGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kYXRhR3JpZC5lbGVtZW50KTsKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcigic29ydGluZyBjaGFuZ2VkIiwgdGhp cy5fc29ydEl0ZW1zLCB0aGlzKTsK 93976 2011-05-18 13:08:10 -0700 2011-05-19 08:30:35 -0700 Pathc network_panel_column_resizing2.patch text/plain 6004 tonistiigi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGQ0MTQ3Li40ODI0OTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTggIFRvbmlzIFRpaWdpICA8dG9uaXN0aWlnaUBnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzaXppbmcgY29sdW1ucyBpbiB0aGUgbmV0d29yayBwYW5lbCBpcyB3ZWlyZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUyMzgKKworICAgICAg ICBNYWtlcyBuZXR3b3JrIHBhbmVsIGNvbHVtbiByZXNpemluZyBtb3JlIHVzYWJsZSBieSBhZGRp bmcgImZpcnN0IG9ubHkiIGFuZCAibGFzdCBvbmx5IgorICAgICAgICByZXNpemluZyBtZXRob2Rz IHRvIFdlYkluc3BlY3Rvci5EYXRhR3JpZC4gQ3VycmVudCBiZWhhdmlvciBpcyBuYW1lZCAibmVh cmVzdCIgYW5kCisgICAgICAgIHJlbWFpbnMgZGVmYXVsdC4gTmV0d29yayBwYW5lbHMgZGF0YWdy aWQgaXMgc2V0IHRvIHVzZSBtZXRob2QgImxhc3QiLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9EYXRhR3JpZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90 b3R5cGUuZ2V0IHJlc2l6ZU1ldGhvZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlLnNldCByZXNpemVNZXRob2QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFH cmlkLnByb3RvdHlwZS5fcmVzaXplckRyYWdnaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFu ZWwucHJvdG90eXBlLl9jcmVhdGVUYWJsZSk6CisKIDIwMTEtMDUtMTggIEV2YW4gTWFydGluICA8 ZXZhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCmluZGV4IDdk NzEwOWEuLjRhODcxNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EYXRhR3JpZC5qcwpAQCAtOTIyLDYgKzkyMiwxOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKICAgICAKKyAgICBnZXQgcmVzaXplTWV0 aG9kKCkKKyAgICB7CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fcmVzaXplTWV0aG9kPT09InVu ZGVmaW5lZCIpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6 ZU1ldGhvZC5OZWFyZXN0OworICAgICAgICByZXR1cm4gdGhpcy5fcmVzaXplTWV0aG9kOworICAg IH0sCisKKyAgICBzZXQgcmVzaXplTWV0aG9kKG1ldGhvZCkKKyAgICB7CisgICAgICAgIHRoaXMu X3Jlc2l6ZU1ldGhvZCA9IG1ldGhvZDsKKyAgICB9LAorICAgIAogICAgIF9zdGFydFJlc2l6ZXJE cmFnZ2luZzogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLmN1cnJlbnRSZXNp emVyID0gZXZlbnQudGFyZ2V0OwpAQCAtOTQyLDEzICs5NTQsMjYgQEAgV2ViSW5zcGVjdG9yLkRh dGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGRyYWdQb2ludCA9IGV2ZW50LmNsaWVu dFggLSB0aGlzLmVsZW1lbnQudG90YWxPZmZzZXRMZWZ0OwogICAgICAgICAvLyBDb25zdHJhaW4g dGhlIGRyYWdwb2ludCB0byBiZSB3aXRoaW4gdGhlIHNwYWNlIG1hZGUgdXAgYnkgdGhlCiAgICAg ICAgIC8vIGNvbHVtbiBkaXJlY3RseSB0byB0aGUgbGVmdCBhbmQgdGhlIGNvbHVtbiBkaXJlY3Rs eSB0byB0aGUgcmlnaHQuCi0gICAgICAgIHZhciBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gPSAw OworICAgICAgICB2YXIgbGVmdENlbGxJbmRleCA9IHJlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29s dW1uSUQ7CisgICAgICAgIHZhciByaWdodENlbGxJbmRleCA9IHJlc2l6ZXIucmlnaHROZWlnaGJv cmluZ0NvbHVtbklEOwogICAgICAgICB2YXIgZmlyc3RSb3dDZWxscyA9IHRoaXMuaGVhZGVyVGFi bGVCb2R5LnJvd3NbMF0uY2VsbHM7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVzaXpl ci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRDsgaSsrKQorICAgICAgICB2YXIgbGVmdEVkZ2VPZlBy ZXZpb3VzQ29sdW1uID0gMDsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsZWZ0Q2VsbElu ZGV4OyBpKyspCiAgICAgICAgICAgICBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKz0gZmlyc3RS b3dDZWxsc1tpXS5vZmZzZXRXaWR0aDsKLSAgICAgICAgICAgIAotICAgICAgICB2YXIgcmlnaHRF ZGdlT2ZOZXh0Q29sdW1uID0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICsgZmlyc3RSb3dDZWxs c1tyZXNpemVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklEXS5vZmZzZXRXaWR0aCArIGZpcnN0Um93 Q2VsbHNbcmVzaXplci5yaWdodE5laWdoYm9yaW5nQ29sdW1uSURdLm9mZnNldFdpZHRoOwotCisg ICAgICAgIAorICAgICAgICAvLyBEaWZmZXJlbmNlcyBmb3Igb3RoZXIgcmVzaXplIG1ldGhvZHMK KyAgICAgICAgaWYodGhpcy5yZXNpemVNZXRob2Q9PVdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNp emVNZXRob2QuTGFzdCkKKyAgICAgICAgeworICAgICAgICAgICAgcmlnaHRDZWxsSW5kZXggPSB0 aGlzLnJlc2l6ZXJzLmxlbmd0aDsKKyAgICAgICAgfQorICAgICAgICBlbHNlIGlmKHRoaXMucmVz aXplTWV0aG9kPT1XZWJJbnNwZWN0b3IuRGF0YUdyaWQuUmVzaXplTWV0aG9kLkZpcnN0KQorICAg ICAgICB7CisgICAgICAgICAgICBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4rPWZpcnN0Um93Q2Vs bHNbbGVmdENlbGxJbmRleF0ub2Zmc2V0V2lkdGggLSBmaXJzdFJvd0NlbGxzWzBdLm9mZnNldFdp ZHRoOworICAgICAgICAgICAgbGVmdENlbGxJbmRleCA9IDA7CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIHZhciByaWdodEVkZ2VPZk5leHRDb2x1bW4gPSBsZWZ0RWRnZU9mUHJldmlvdXND b2x1bW4gKyBmaXJzdFJvd0NlbGxzW2xlZnRDZWxsSW5kZXhdLm9mZnNldFdpZHRoICsgZmlyc3RS b3dDZWxsc1tyaWdodENlbGxJbmRleF0ub2Zmc2V0V2lkdGg7CisgICAgICAgIAogICAgICAgICAv LyBHaXZlIGVhY2ggY29sdW1uIHNvbWUgcGFkZGluZyBzbyB0aGF0IHRoZXkgZG9uJ3QgZGlzYXBw ZWFyLgogICAgICAgICB2YXIgbGVmdE1pbmltdW0gPSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4g KyB0aGlzLkNvbHVtblJlc2l6ZVBhZGRpbmc7CiAgICAgICAgIHZhciByaWdodE1heGltdW0gPSBy aWdodEVkZ2VPZk5leHRDb2x1bW4gLSB0aGlzLkNvbHVtblJlc2l6ZVBhZGRpbmc7CkBAIC05NTgs MTIgKzk4MywxMiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAg ICByZXNpemVyLnN0eWxlLmxlZnQgPSAoZHJhZ1BvaW50IC0gdGhpcy5DZW50ZXJSZXNpemVyT3Zl ckJvcmRlckFkanVzdG1lbnQpICsgInB4IjsKIAogICAgICAgICB2YXIgcGVyY2VudExlZnRDb2x1 bW4gPSAoKChkcmFnUG9pbnQgLSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4pIC8gdGhpcy5fZGF0 YVRhYmxlLm9mZnNldFdpZHRoKSAqIDEwMCkgKyAiJSI7Ci0gICAgICAgIHRoaXMuX2hlYWRlclRh YmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRF0u c3R5bGUud2lkdGggPSBwZXJjZW50TGVmdENvbHVtbjsKLSAgICAgICAgdGhpcy5fZGF0YVRhYmxl Q29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdDb2x1bW5JRF0uc3R5 bGUud2lkdGggPSBwZXJjZW50TGVmdENvbHVtbjsKKyAgICAgICAgdGhpcy5faGVhZGVyVGFibGVD b2x1bW5Hcm91cC5jaGlsZHJlbltsZWZ0Q2VsbEluZGV4XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRM ZWZ0Q29sdW1uOworICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlblts ZWZ0Q2VsbEluZGV4XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1uOwogCiAgICAgICAg IHZhciBwZXJjZW50UmlnaHRDb2x1bW4gPSAoKChyaWdodEVkZ2VPZk5leHRDb2x1bW4gLSBkcmFn UG9pbnQpIC8gdGhpcy5fZGF0YVRhYmxlLm9mZnNldFdpZHRoKSAqIDEwMCkgKyAiJSI7Ci0gICAg ICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5yaWdodE5l aWdoYm9yaW5nQ29sdW1uSURdLnN0eWxlLndpZHRoID0gIHBlcmNlbnRSaWdodENvbHVtbjsKLSAg ICAgICAgdGhpcy5fZGF0YVRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5yaWdodE5l aWdoYm9yaW5nQ29sdW1uSURdLnN0eWxlLndpZHRoID0gcGVyY2VudFJpZ2h0Q29sdW1uOworICAg ICAgICB0aGlzLl9oZWFkZXJUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW3JpZ2h0Q2VsbEluZGV4 XS5zdHlsZS53aWR0aCA9ICBwZXJjZW50UmlnaHRDb2x1bW47CisgICAgICAgIHRoaXMuX2RhdGFU YWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW3JpZ2h0Q2VsbEluZGV4XS5zdHlsZS53aWR0aCA9IHBl cmNlbnRSaWdodENvbHVtbjsKIAogICAgICAgICB0aGlzLl9wb3NpdGlvblJlc2l6ZXJzKCk7CiAg ICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CkBAIC05ODIsNiArMTAwNywxMiBAQCBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgIENlbnRlclJlc2l6ZXJPdmVyQm9y ZGVyQWRqdXN0bWVudDogMywKIH0KIAorV2ViSW5zcGVjdG9yLkRhdGFHcmlkLlJlc2l6ZU1ldGhv ZCA9IHsKKyAgICBOZWFyZXN0OiAgICAnbmVhcmVzdCcsCisgICAgRmlyc3Q6ICAgICAgJ2ZpcnN0 JywKKyAgICBMYXN0OiAgICAgICAnbGFzdCcKK30KKwogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAogV2Vi SW5zcGVjdG9yLkRhdGFHcmlkTm9kZSA9IGZ1bmN0aW9uKGRhdGEsIGhhc0NoaWxkcmVuKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpp bmRleCA1NDExM2RjLi43MWJlZGU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMTg1LDYgKzE4NSw3IEBAIFdlYkluc3Bl Y3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBjb2x1bW5zLnRpbWVsaW5l LnNvcnQgPSAiYXNjZW5kaW5nIjsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJ bnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2l6 ZU1ldGhvZCA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuTGFzdDsKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIs IHRoaXMuX2NvbnRleHRNZW51LmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICB0aGlzLmNvbnRh aW5lckVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CiAgICAgICAg IHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoInNvcnRpbmcgY2hhbmdlZCIsIHRoaXMu X3NvcnRJdGVtcywgdGhpcyk7Cg== 94071 2011-05-19 08:30:35 -0700 2011-05-19 11:15:13 -0700 Patch with style fixes network_panel_column_resizing3.patch text/plain 5973 tonistiigi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGQ0MTQ3Li40ODI0OTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDUtMTggIFRvbmlzIFRpaWdpICA8dG9uaXN0aWlnaUBnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVzaXppbmcgY29sdW1ucyBpbiB0aGUgbmV0d29yayBwYW5lbCBpcyB3ZWlyZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUyMzgKKworICAgICAg ICBNYWtlcyBuZXR3b3JrIHBhbmVsIGNvbHVtbiByZXNpemluZyBtb3JlIHVzYWJsZSBieSBhZGRp bmcgImZpcnN0IG9ubHkiIGFuZCAibGFzdCBvbmx5IgorICAgICAgICByZXNpemluZyBtZXRob2Rz IHRvIFdlYkluc3BlY3Rvci5EYXRhR3JpZC4gQ3VycmVudCBiZWhhdmlvciBpcyBuYW1lZCAibmVh cmVzdCIgYW5kCisgICAgICAgIHJlbWFpbnMgZGVmYXVsdC4gTmV0d29yayBwYW5lbHMgZGF0YWdy aWQgaXMgc2V0IHRvIHVzZSBtZXRob2QgImxhc3QiLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9EYXRhR3JpZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90 b3R5cGUuZ2V0IHJlc2l6ZU1ldGhvZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlLnNldCByZXNpemVNZXRob2QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFH cmlkLnByb3RvdHlwZS5fcmVzaXplckRyYWdnaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFu ZWwucHJvdG90eXBlLl9jcmVhdGVUYWJsZSk6CisKIDIwMTEtMDUtMTggIEV2YW4gTWFydGluICA8 ZXZhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCmluZGV4IDdk NzEwOWEuLjI0NGRiNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EYXRhR3JpZC5qcwpAQCAtOTIyLDYgKzkyMiwxOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKICAgICAKKyAgICBnZXQgcmVzaXplTWV0 aG9kKCkKKyAgICB7CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fcmVzaXplTWV0aG9kID09PSAi dW5kZWZpbmVkIikKKyAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuUmVz aXplTWV0aG9kLk5lYXJlc3Q7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXNpemVNZXRob2Q7Cisg ICAgfSwKKworICAgIHNldCByZXNpemVNZXRob2QobWV0aG9kKQorICAgIHsKKyAgICAgICAgdGhp cy5fcmVzaXplTWV0aG9kID0gbWV0aG9kOworICAgIH0sCisgICAgCiAgICAgX3N0YXJ0UmVzaXpl ckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuY3VycmVudFJl c2l6ZXIgPSBldmVudC50YXJnZXQ7CkBAIC05NDIsMTMgKzk1NCwyMyBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZHJhZ1BvaW50ID0gZXZlbnQuY2xp ZW50WCAtIHRoaXMuZWxlbWVudC50b3RhbE9mZnNldExlZnQ7CiAgICAgICAgIC8vIENvbnN0cmFp biB0aGUgZHJhZ3BvaW50IHRvIGJlIHdpdGhpbiB0aGUgc3BhY2UgbWFkZSB1cCBieSB0aGUKICAg ICAgICAgLy8gY29sdW1uIGRpcmVjdGx5IHRvIHRoZSBsZWZ0IGFuZCB0aGUgY29sdW1uIGRpcmVj dGx5IHRvIHRoZSByaWdodC4KLSAgICAgICAgdmFyIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiA9 IDA7CisgICAgICAgIHZhciBsZWZ0Q2VsbEluZGV4ID0gcmVzaXplci5sZWZ0TmVpZ2hib3JpbmdD b2x1bW5JRDsKKyAgICAgICAgdmFyIHJpZ2h0Q2VsbEluZGV4ID0gcmVzaXplci5yaWdodE5laWdo Ym9yaW5nQ29sdW1uSUQ7CiAgICAgICAgIHZhciBmaXJzdFJvd0NlbGxzID0gdGhpcy5oZWFkZXJU YWJsZUJvZHkucm93c1swXS5jZWxsczsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByZXNp emVyLmxlZnROZWlnaGJvcmluZ0NvbHVtbklEOyBpKyspCisgICAgICAgIHZhciBsZWZ0RWRnZU9m UHJldmlvdXNDb2x1bW4gPSAwOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlZnRDZWxs SW5kZXg7IGkrKykKICAgICAgICAgICAgIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiArPSBmaXJz dFJvd0NlbGxzW2ldLm9mZnNldFdpZHRoOwotICAgICAgICAgICAgCi0gICAgICAgIHZhciByaWdo dEVkZ2VPZk5leHRDb2x1bW4gPSBsZWZ0RWRnZU9mUHJldmlvdXNDb2x1bW4gKyBmaXJzdFJvd0Nl bGxzW3Jlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29sdW1uSURdLm9mZnNldFdpZHRoICsgZmlyc3RS b3dDZWxsc1tyZXNpemVyLnJpZ2h0TmVpZ2hib3JpbmdDb2x1bW5JRF0ub2Zmc2V0V2lkdGg7Ci0K KyAgICAgICAgCisgICAgICAgIC8vIERpZmZlcmVuY2VzIGZvciBvdGhlciByZXNpemUgbWV0aG9k cworICAgICAgICBpZiAodGhpcy5yZXNpemVNZXRob2QgPT0gV2ViSW5zcGVjdG9yLkRhdGFHcmlk LlJlc2l6ZU1ldGhvZC5MYXN0KSB7CisgICAgICAgICAgICByaWdodENlbGxJbmRleCA9IHRoaXMu cmVzaXplcnMubGVuZ3RoOworICAgICAgICB9IGVsc2UgaWYgKHRoaXMucmVzaXplTWV0aG9kID09 IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QuRmlyc3QpIHsKKyAgICAgICAgICAg IGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiArPSBmaXJzdFJvd0NlbGxzW2xlZnRDZWxsSW5kZXhd Lm9mZnNldFdpZHRoIC0gZmlyc3RSb3dDZWxsc1swXS5vZmZzZXRXaWR0aDsKKyAgICAgICAgICAg IGxlZnRDZWxsSW5kZXggPSAwOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB2YXIgcmln aHRFZGdlT2ZOZXh0Q29sdW1uID0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICsgZmlyc3RSb3dD ZWxsc1tsZWZ0Q2VsbEluZGV4XS5vZmZzZXRXaWR0aCArIGZpcnN0Um93Q2VsbHNbcmlnaHRDZWxs SW5kZXhdLm9mZnNldFdpZHRoOworICAgICAgICAKICAgICAgICAgLy8gR2l2ZSBlYWNoIGNvbHVt biBzb21lIHBhZGRpbmcgc28gdGhhdCB0aGV5IGRvbid0IGRpc2FwcGVhci4KICAgICAgICAgdmFy IGxlZnRNaW5pbXVtID0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICsgdGhpcy5Db2x1bW5SZXNp emVQYWRkaW5nOwogICAgICAgICB2YXIgcmlnaHRNYXhpbXVtID0gcmlnaHRFZGdlT2ZOZXh0Q29s dW1uIC0gdGhpcy5Db2x1bW5SZXNpemVQYWRkaW5nOwpAQCAtOTU4LDEyICs5ODAsMTIgQEAgV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVzaXplci5zdHlsZS5s ZWZ0ID0gKGRyYWdQb2ludCAtIHRoaXMuQ2VudGVyUmVzaXplck92ZXJCb3JkZXJBZGp1c3RtZW50 KSArICJweCI7CiAKICAgICAgICAgdmFyIHBlcmNlbnRMZWZ0Q29sdW1uID0gKCgoZHJhZ1BvaW50 IC0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uKSAvIHRoaXMuX2RhdGFUYWJsZS5vZmZzZXRXaWR0 aCkgKiAxMDApICsgIiUiOwotICAgICAgICB0aGlzLl9oZWFkZXJUYWJsZUNvbHVtbkdyb3VwLmNo aWxkcmVuW3Jlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29sdW1uSURdLnN0eWxlLndpZHRoID0gcGVy Y2VudExlZnRDb2x1bW47Ci0gICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNoaWxk cmVuW3Jlc2l6ZXIubGVmdE5laWdoYm9yaW5nQ29sdW1uSURdLnN0eWxlLndpZHRoID0gcGVyY2Vu dExlZnRDb2x1bW47CisgICAgICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRy ZW5bbGVmdENlbGxJbmRleF0uc3R5bGUud2lkdGggPSBwZXJjZW50TGVmdENvbHVtbjsKKyAgICAg ICAgdGhpcy5fZGF0YVRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bbGVmdENlbGxJbmRleF0uc3R5 bGUud2lkdGggPSBwZXJjZW50TGVmdENvbHVtbjsKIAogICAgICAgICB2YXIgcGVyY2VudFJpZ2h0 Q29sdW1uID0gKCgocmlnaHRFZGdlT2ZOZXh0Q29sdW1uIC0gZHJhZ1BvaW50KSAvIHRoaXMuX2Rh dGFUYWJsZS5vZmZzZXRXaWR0aCkgKiAxMDApICsgIiUiOwotICAgICAgICB0aGlzLl9oZWFkZXJU YWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW3Jlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklE XS5zdHlsZS53aWR0aCA9ICBwZXJjZW50UmlnaHRDb2x1bW47Ci0gICAgICAgIHRoaXMuX2RhdGFU YWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW3Jlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklE XS5zdHlsZS53aWR0aCA9IHBlcmNlbnRSaWdodENvbHVtbjsKKyAgICAgICAgdGhpcy5faGVhZGVy VGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyaWdodENlbGxJbmRleF0uc3R5bGUud2lkdGggPSAg cGVyY2VudFJpZ2h0Q29sdW1uOworICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5j aGlsZHJlbltyaWdodENlbGxJbmRleF0uc3R5bGUud2lkdGggPSBwZXJjZW50UmlnaHRDb2x1bW47 CiAKICAgICAgICAgdGhpcy5fcG9zaXRpb25SZXNpemVycygpOwogICAgICAgICBldmVudC5wcmV2 ZW50RGVmYXVsdCgpOwpAQCAtOTgyLDYgKzEwMDQsMTIgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlk LnByb3RvdHlwZSA9IHsKICAgICBDZW50ZXJSZXNpemVyT3ZlckJvcmRlckFkanVzdG1lbnQ6IDMs CiB9CiAKK1dlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QgPSB7CisgICAgTmVhcmVz dDogIm5lYXJlc3QiLAorICAgIEZpcnN0OiAiZmlyc3QiLAorICAgIExhc3Q6ICJsYXN0IgorfQor CiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5PYmplY3QucHJvdG90eXBlOwogCiBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlID0gZnVuY3Rp b24oZGF0YSwgaGFzQ2hpbGRyZW4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDU0MTEzZGMuLjcxYmVkZTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBA IC0xODUsNiArMTg1LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGNvbHVtbnMudGltZWxpbmUuc29ydCA9ICJhc2NlbmRpbmciOwogCiAgICAgICAg IHRoaXMuX2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKKyAg ICAgICAgdGhpcy5fZGF0YUdyaWQucmVzaXplTWV0aG9kID0gV2ViSW5zcGVjdG9yLkRhdGFHcmlk LlJlc2l6ZU1ldGhvZC5MYXN0OwogICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29udGV4dE1lbnUuYmluZCh0aGlzKSwg dHJ1ZSk7CiAgICAgICAgIHRoaXMuY29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9k YXRhR3JpZC5lbGVtZW50KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5l cigic29ydGluZyBjaGFuZ2VkIiwgdGhpcy5fc29ydEl0ZW1zLCB0aGlzKTsK