75229 2011-12-26 10:49:44 -0800 Web Inspector: Extract FileEditor from ScriptsPanel. 2011-12-26 11:47:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75093 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 527224 0 vsevik 2011-12-26 10:49:44 -0800 Extract FileEditor from ScriptsPanel. 527226 1 120557 vsevik 2011-12-26 10:59:15 -0800 Created attachment 120557 Patch 527228 2 120557 pfeldman 2011-12-26 11:23:37 -0800 Comment on attachment 120557 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120557&action=review Please rename new interface and a class prior to landing. > Source/WebCore/inspector/front-end/ScriptsPanel.js:1073 > +WebInspector.ScriptsPanel.FileEditor = function() { } FileEditor is not a great name for this. We have TextViewer (that was renamed from TextEditor when we stripped editing capabilities that should be renamed back). This looks like a WebInspector.EditorContainer to me. > Source/WebCore/inspector/front-end/UISourceCode.js:145 > + if (!this._fileName) What if fileName is "" ? 527230 3 vsevik 2011-12-26 11:47:30 -0800 Committed r103690: <http://trac.webkit.org/changeset/103690> 120557 2011-12-26 10:59:15 -0800 2011-12-26 11:23:37 -0800 Patch bug-75229-20111226225913.patch text/plain 17444 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhmZDI3YTA0NTdkMDJh N2IzZmI4ZTk1NDFhYzE2MDgyYWQ3YmI4Ni4uMDczY2RlZTJmYTczNGEwMWFiYjNiNDRlMmRlODFl MDVjYmFjMjdkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDExLTEyLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEV4dHJhY3QgRmlsZUVkaXRvciBmcm9tIFNjcmlwdHNQYW5lbC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjI5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ph dmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 U291cmNlRnJhbWUucHJvdG90eXBlLnN1Z2dlc3RlZEZpbGVOYW1lKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanM6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZS5fcmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUuZ2V0IHZpc2libGVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlLl91cGRhdGVTY3JpcHRWaWV3U3RhdHVzQmFySXRlbXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VpU291cmNlQ29k ZVJlcGxhY2VkLmdldCBpZik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZp bGVFZGl0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlRWRpdG9y LnByb3RvdHlwZS5nZXQgY3VycmVudFNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwuRmlsZUVkaXRvci5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVFZGl0b3IucHJvdG90eXBlLnNob3dTb3VyY2VGcmFt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVFZGl0b3IucHJvdG90 eXBlLmlzU291cmNlRnJhbWVPcGVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwuRmlsZUVkaXRvci5wcm90b3R5cGUucmVwbGFjZVNvdXJjZUZyYW1lcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVFZGl0b3IucHJvdG90eXBlLnNldFNvdXJjZUZy YW1lSXNEaXJ0eSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVFZGl0 b3IucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu U2luZ2xlRmlsZUVkaXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlNp bmdsZUZpbGVFZGl0b3IucHJvdG90eXBlLmdldCBjdXJyZW50U291cmNlRnJhbWUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVGaWxlRWRpdG9yLnByb3RvdHlwZS5z aG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRv ci5wcm90b3R5cGUuc2hvd1NvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRvci5wcm90b3R5cGUuaXNTb3VyY2VGcmFtZU9wZW4pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVGaWxlRWRpdG9yLnByb3Rv dHlwZS5yZXBsYWNlU291cmNlRnJhbWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwuU2luZ2xlRmlsZUVkaXRvci5wcm90b3R5cGUuc2V0U291cmNlRnJhbWVJc0RpcnR5KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRvci5wcm90 b3R5cGUucmVzZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2Rl LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUuZ2V0IGZp bGVOYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlLl9w YXJzZVVSTCk6CisKKzIwMTEtMTItMjYgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRXh0cmFjdCBGaWxlU2VsZWN0b3IgZnJv bSBTY3JpcHRzUGFuZWwuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTE3MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IDdmZWM0ODNiYzA4MDRl ZmNjODllMjc5YjhiMjk3MzcwNTYzMDcwNjQuLmQ5YzIxYTQ0MGI3YmVlZmRkY2Q1ODRhMTQyNDA3 ZmUwMzcyZDc3MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC03OCw3ICs3OCw3IEBAIFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgc3Vn Z2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl91 aVNvdXJjZUNvZGUuZGlzcGxheU5hbWUgfHwgInVudGl0bGVkLmpzIjsKKyAgICAgICAgcmV0dXJu IHRoaXMuX3VpU291cmNlQ29kZS5maWxlTmFtZSB8fCAidW50aXRsZWQuanMiOwogICAgIH0sCiAK ICAgICBlZGl0Q29udGVudDogZnVuY3Rpb24obmV3Q29udGVudCwgY2FsbGJhY2spCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3Iu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3Iu anMKaW5kZXggYTU1NjU3ZDVkOWFiMjVhM2U0OGQ0ZjFhMTU1MTQ4MzYwYjVmZjgxNi4uYjY1Njgy NTBjNTY2ZjIyNDU2NjgyNjdkNGQyMTM3NzE2YjM5MjEzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcwpAQCAtOTks NyArOTksNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIAogICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhhdmUgYSBzZXBhcmF0ZSBzZWN0 aW9uIGZvciBhbm9ueW1vdXMgc2NyaXB0cy4KICAgICAgICAgCi0gICAgICAgIHZhciBzY3JpcHRU aXRsZSA9IHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZSA/IHVpU291cmNlQ29kZS5kaXNwbGF5TmFt ZSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CisgICAgICAgIHZhciBzY3Jp cHRUaXRsZSA9IHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZTsKICAgICAgICAgdmFyIHNjcmlwdFRy ZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudCh0 aGlzLCB1aVNvdXJjZUNvZGUsIHNjcmlwdFRpdGxlKTsKICAgICAgICAgdGhpcy5fc2NyaXB0VHJl ZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUucHV0KHVpU291cmNlQ29kZSwgc2NyaXB0VHJlZUVsZW1l bnQpOwogICAgICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggNzlhYjdiM2VjMTY5ZTY4ODRmZDVkMThhMmY2MWNkMjI4 ZGJmNDRjYi4uNGM1MjA1YzFlMGQzNDFlYzk2ZWVjZWNiYTk4MmFiYmJiZmYxZmVmNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTYzLDcgKzYzLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHBy ZXNlbnRhdGlvbk1vZGVsKQogICAgICAgICBjb25zdCBpbml0aWFsTmF2aWdhdG9yV2lkdGggPSAy MjU7CiAgICAgICAgIGNvbnN0IG1pbmltYWxWaWV3c0NvbnRhaW5lcldpZHRoUGVyY2VudCA9IDUw OwogICAgICAgICB0aGlzLmVkaXRvclZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlNwbGl0VmlldyhX ZWJJbnNwZWN0b3IuU3BsaXRWaWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0LCAic2NyaXB0c1BhbmVs TmF2aWdhdG9yU2lkZWJhcldpZHRoIiwgaW5pdGlhbE5hdmlnYXRvcldpZHRoKTsKLSAgICAgICAg CisKICAgICAgICAgdGhpcy5lZGl0b3JWaWV3Lm1pbmltYWxTaWRlYmFyV2lkdGggPSBQcmVmZXJl bmNlcy5taW5TY3JpcHRzU2lkZWJhcldpZHRoOwogICAgICAgICB0aGlzLmVkaXRvclZpZXcubWlu aW1hbE1haW5XaWR0aFBlcmNlbnQgPSBtaW5pbWFsVmlld3NDb250YWluZXJXaWR0aFBlcmNlbnQ7 CiAgICAgICAgIHRoaXMuZWRpdG9yVmlldy5zaG93KHRoaXMuc3BsaXRWaWV3Lm1haW5FbGVtZW50 KTsKQEAgLTczLDE5ICs3MywyMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rp b24ocHJlc2VudGF0aW9uTW9kZWwpCiAKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnNob3co dGhpcy5lZGl0b3JWaWV3LnNpZGViYXJFbGVtZW50KTsKIAotICAgICAgICB0aGlzLnZpZXdzQ29u dGFpbmVyRWxlbWVudCA9IHRoaXMuZWRpdG9yVmlldy5tYWluRWxlbWVudDsKLQogICAgICAgICB0 aGlzLl9uYXZpZ2F0b3JSZXNpemVXaWRnZXRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclJlc2l6ZVdpZGdldEVsZW1lbnQuaWQg PSAic2NyaXB0cy1uYXZpZ2F0b3ItcmVzaXplci13aWRnZXQiOwogICAgICAgICB0aGlzLmVkaXRv clZpZXcuaW5zdGFsbFJlc2l6ZXIodGhpcy5fbmF2aWdhdG9yUmVzaXplV2lkZ2V0RWxlbWVudCk7 CiAgICAgICAgIHRoaXMuZWRpdG9yVmlldy5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9uYXZpZ2F0b3JSZXNpemVXaWRnZXRFbGVtZW50KTsKKworICAgICAgICAvLyBGSVhNRTogV2Ug c2hvdWxkIHVzZSBuZXcgVGFiYmVkRWRpdG9yIGhlcmUuCisgICAgICAgIHRoaXMuX2ZpbGVFZGl0 b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5TaW5nbGVGaWxlRWRpdG9yKCk7Cisg ICAgICAgIHRoaXMuX2ZpbGVFZGl0b3Iuc2hvdyh0aGlzLmVkaXRvclZpZXcubWFpbkVsZW1lbnQp OwogICAgIH0gZWxzZSB7CiAgICAgICAgIHRoaXMuX2ZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yKHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsKTsKICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnNob3dEZWJ1Z1NpZGViYXJSZXNp emVXaWRnZXQodGhpcy5kZWJ1Z1NpZGViYXJSZXNpemVXaWRnZXRFbGVtZW50KTsKLSAgICAgICAg dGhpcy52aWV3c0NvbnRhaW5lckVsZW1lbnQgPSB0aGlzLnNwbGl0Vmlldy5tYWluRWxlbWVudDsK ICAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0b3IuRXZlbnRzLlNjcmlwdFNlbGVjdGVkLCB0aGlzLl9z Y3JpcHRTZWxlY3RlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2ZpbGVTZWxlY3Rvci5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5S ZWxlYXNlZEZvY3VzQWZ0ZXJTZWxlY3Rpb24sIHRoaXMuX2ZpbGVTZWxlY3RvclJlbGVhc2VkRm9j dXMsIHRoaXMpOwogICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3Iuc2hvdyh0aGlzLnNwbGl0Vmll dy5tYWluRWxlbWVudCk7CisgICAgICAgIAorICAgICAgICB0aGlzLl9maWxlRWRpdG9yID0gbmV3 IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRvcigpOworICAgICAgICB0 aGlzLl9maWxlRWRpdG9yLnNob3codGhpcy5zcGxpdFZpZXcubWFpbkVsZW1lbnQpOwogICAgIH0K IAogICAgIHRoaXMuc2lkZWJhclBhbmVzID0ge307CkBAIC00MDMsOCArNDA3LDYgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVzZXQ6IGZ1bmN0aW9u KHByZXNlcnZlSXRlbXMpCiAgICAgewotICAgICAgICB0aGlzLnZpc2libGVWaWV3ID0gbnVsbDsK LQogICAgICAgICBkZWxldGUgdGhpcy5jdXJyZW50UXVlcnk7CiAgICAgICAgIHRoaXMuc2VhcmNo Q2FuY2VsZWQoKTsKIApAQCAtNDEyLDcgKzQxNCw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pbml0aWFsVmlld1NlbGVj dGlvblByb2Nlc3NlZDsKIAotICAgICAgICB0aGlzLnZpc2libGVWaWV3ID0gbnVsbDsKKyAgICAg ICAgdGhpcy5fZmlsZUVkaXRvci5yZXNldCgpOworICAgICAgICB0aGlzLl91cGRhdGVTY3JpcHRW aWV3U3RhdHVzQmFySXRlbXMoKTsKIAogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFr cG9pbnRzLnJlc2V0KCk7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLndhdGNoRXhwcmVzc2lv bnMucmVzZXQoKTsKQEAgLTQyMiwyMyArNDI1LDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHZpc2libGVWaWV3KCkKICAgICB7Ci0gICAgICAg IHJldHVybiB0aGlzLl92aXNpYmxlVmlldzsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbGVFZGl0 b3IuY3VycmVudFNvdXJjZUZyYW1lOwogICAgIH0sCiAKLSAgICBzZXQgdmlzaWJsZVZpZXcoeCkK KyAgICBfdXBkYXRlU2NyaXB0Vmlld1N0YXR1c0Jhckl0ZW1zOiBmdW5jdGlvbigpCiAgICAgewot ICAgICAgICBpZiAodGhpcy5fdmlzaWJsZVZpZXcgPT09IHgpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgaWYgKHRoaXMuX3Zpc2libGVWaWV3KQotICAgICAgICAgICAgdGhpcy5fdmlz aWJsZVZpZXcuZGV0YWNoKCk7Ci0KLSAgICAgICAgdGhpcy5fdmlzaWJsZVZpZXcgPSB4OwotCi0g ICAgICAgIGlmICh4KSB7Ci0gICAgICAgICAgICB4LnNob3codGhpcy52aWV3c0NvbnRhaW5lckVs ZW1lbnQpOwotICAgICAgICAgICAgdGhpcy5fc2NyaXB0Vmlld1N0YXR1c0Jhckl0ZW1zQ29udGFp bmVyLnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICB2YXIgc3RhdHVzQmFySXRlbXMgPSB4 LnN0YXR1c0Jhckl0ZW1zIHx8IFtdOworICAgICAgICB0aGlzLl9zY3JpcHRWaWV3U3RhdHVzQmFy SXRlbXNDb250YWluZXIucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgCisgICAgICAgIHZhciBz b3VyY2VGcmFtZSA9IHRoaXMudmlzaWJsZVZpZXc7CisgICAgICAgIGlmIChzb3VyY2VGcmFtZSkg eworICAgICAgICAgICAgdmFyIHN0YXR1c0Jhckl0ZW1zID0gc291cmNlRnJhbWUuc3RhdHVzQmFy SXRlbXMgfHwgW107CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHN0YXR1c0Jhckl0 ZW1zLmxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIHRoaXMuX3NjcmlwdFZpZXdTdGF0dXNC YXJJdGVtc0NvbnRhaW5lci5hcHBlbmRDaGlsZChzdGF0dXNCYXJJdGVtc1tpXSk7CiAgICAgICAg IH0KQEAgLTQ3OSw3ICs0NzUsOSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICBfc2hvd1NvdXJjZUZyYW1lOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAg ewogICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGcmFtZXNCeVVJU291cmNl Q29kZS5nZXQodWlTb3VyY2VDb2RlKSB8fCB0aGlzLl9jcmVhdGVTb3VyY2VGcmFtZSh1aVNvdXJj ZUNvZGUpOwotICAgICAgICB0aGlzLnZpc2libGVWaWV3ID0gc291cmNlRnJhbWU7CisKKyAgICAg ICAgdGhpcy5fZmlsZUVkaXRvci5zaG93U291cmNlRnJhbWUodWlTb3VyY2VDb2RlLmRpc3BsYXlO YW1lLCBzb3VyY2VGcmFtZSk7CisgICAgICAgIHRoaXMuX3VwZGF0ZVNjcmlwdFZpZXdTdGF0dXNC YXJJdGVtcygpOwogCiAgICAgICAgIGlmICh1aVNvdXJjZUNvZGUudXJsKQogICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLmxhc3RWaWV3ZWRTY3JpcHRGaWxlLnNldCh1aVNvdXJjZUNv ZGUudXJsKTsKQEAgLTU1MSwyMyArNTQ5LDM2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlTGlzdCA9IC8qKiBAdHlwZSB7 QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fSAqLyBldmVudC5kYXRhLnVpU291cmNl Q29kZUxpc3Q7CiAKICAgICAgICAgdmFyIGFkZGVkVG9GaWxlU2VsZWN0b3IgPSBmYWxzZTsKLSAg ICAgICAgdmFyIHZpc2libGUgPSBmYWxzZTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lcyA9IFtd OwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG9sZFVJU291cmNlQ29kZUxpc3QubGVuZ3Ro OyArK2kpIHsKICAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBvbGRVSVNvdXJjZUNvZGVM aXN0W2ldOworICAgICAgICAgICAgdmFyIG9sZFNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJh bWVzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CiAKICAgICAgICAgICAgIGlmICh0 aGlzLl9maWxlU2VsZWN0b3IuaXNTY3JpcHRTb3VyY2VBZGRlZCh1aVNvdXJjZUNvZGUpKSB7Ci0g ICAgICAgICAgICAgICAgYWRkZWRUb0ZpbGVTZWxlY3RvciA9IHRydWU7IAotICAgICAgICAgICAg ICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLmdl dCh1aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgICAgIGlmIChzb3VyY2VGcmFtZSAmJiBzb3Vy Y2VGcmFtZSA9PT0gdGhpcy52aXNpYmxlVmlldykKLSAgICAgICAgICAgICAgICAgICAgdmlzaWJs ZSA9IHRydWU7CisgICAgICAgICAgICAgICAgYWRkZWRUb0ZpbGVTZWxlY3RvciA9IHRydWU7CisK KyAgICAgICAgICAgICAgICBpZiAob2xkU291cmNlRnJhbWUpCisgICAgICAgICAgICAgICAgICAg IHNvdXJjZUZyYW1lcy5wdXNoKG9sZFNvdXJjZUZyYW1lKTsKICAgICAgICAgICAgICAgICB0aGlz Ll9yZW1vdmVTb3VyY2VGcmFtZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAKICAgICAgICAgaWYgKGFkZGVkVG9GaWxlU2VsZWN0b3IpIHsKICAgICAgICAgICAgIHRo aXMuX2ZpbGVTZWxlY3Rvci5yZXBsYWNlVUlTb3VyY2VDb2RlcyhvbGRVSVNvdXJjZUNvZGVMaXN0 LCB1aVNvdXJjZUNvZGVMaXN0KTsKLSAgICAgICAgICAgIGlmICh2aXNpYmxlKQotICAgICAgICAg ICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFtZSh1aVNvdXJjZUNvZGVMaXN0WzBdKTsKKworICAg ICAgICAgICAgdmFyIHNob3VsZFJlcGxhY2UgPSBmYWxzZTsKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgc291cmNlRnJhbWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAg aWYgKHRoaXMuX2ZpbGVFZGl0b3IuaXNTb3VyY2VGcmFtZU9wZW4oc291cmNlRnJhbWVzW2ldKSkg eworICAgICAgICAgICAgICAgICAgICBzaG91bGRSZXBsYWNlID0gdHJ1ZTsKKyAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBpZiAoc2hvdWxkUmVwbGFjZSkgeworICAgICAgICAgICAgICAgIHZhciBuZXdVSVNv dXJjZUNvZGUgPSB1aVNvdXJjZUNvZGVMaXN0WzBdOworICAgICAgICAgICAgICAgIHZhciBzb3Vy Y2VGcmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLmdldChuZXdVSVNvdXJj ZUNvZGUpIHx8IHRoaXMuX2NyZWF0ZVNvdXJjZUZyYW1lKG5ld1VJU291cmNlQ29kZSk7CisgICAg ICAgICAgICAgICAgdGhpcy5fZmlsZUVkaXRvci5yZXBsYWNlU291cmNlRnJhbWVzKHNvdXJjZUZy YW1lcywgbmV3VUlTb3VyY2VDb2RlLmRpc3BsYXlOYW1lLCBzb3VyY2VGcmFtZSk7CisgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9LAogCkBAIC0xMDU3LDYgKzEwNjgsNTAgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlU2VsZWN0b3IucHJvdG90eXBlID0gewogfQogCiAvKioK KyAqIEBpbnRlcmZhY2UKKyAqLworV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlRWRpdG9y ID0gZnVuY3Rpb24oKSB7IH0KKworV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5GaWxlRWRpdG9y LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lfQorICAgICAqLworICAgIGdldCBjdXJyZW50U291cmNlRnJhbWUoKSB7IH0sCisKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGVsZW1lbnQKKyAgICAgKi8KKyAgICBzaG93 OiBmdW5jdGlvbihlbGVtZW50KSB7IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmlu Z30gdGl0bGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNl RnJhbWUKKyAgICAgKi8KKyAgICBzaG93U291cmNlRnJhbWU6IGZ1bmN0aW9uKHRpdGxlLCBzb3Vy Y2VGcmFtZSkgeyB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWV9IHNvdXJjZUZyYW1lCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KKyAgICAgKi8K KyAgICBpc1NvdXJjZUZyYW1lT3BlbjogZnVuY3Rpb24oc291cmNlRnJhbWUpIHsgcmV0dXJuIGZh bHNlOyB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lPn0gb2xkU291cmNlRnJhbWVzCisgICAgICogQHBhcmFtIHtzdHJpbmd9IHRpdGxl CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNvdXJjZUZyYW1lCisg ICAgICovCisgICAgcmVwbGFjZVNvdXJjZUZyYW1lczogZnVuY3Rpb24ob2xkU291cmNlRnJhbWVz LCB0aXRsZSwgc291cmNlRnJhbWUpIHsgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAgICAqIEBwYXJhbSB7Ym9vbGVh bn0gaXNEaXJ0eQorICAgICAqLworICAgIHNldFNvdXJjZUZyYW1lSXNEaXJ0eTogZnVuY3Rpb24o c291cmNlRnJhbWUsIGlzRGlydHkpIHsgfSwKKworICAgIHJlc2V0OiBmdW5jdGlvbigpIHsgfQor fQorCisvKioKICAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVT ZWxlY3Rvcn0KICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQogICogQGNvbnN0cnVj dG9yCkBAIC0xMjk5LDEwICsxMzU0LDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29t Ym9Cb3hGaWxlU2VsZWN0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZm9sZGVyTmFtZUZv clNvcnRpbmcgPSBjb250ZW50U2NyaXB0UHJlZml4ICsgKGRvbWFpbiA/IGRvbWFpbiArICJcdFx0 IiA6ICIiKSArIGZvbGRlck5hbWU7CiAKICAgICAgICAgaWYgKHNob3dTY3JpcHRGb2xkZXJzKSB7 Ci0gICAgICAgICAgICBvcHRpb24udGV4dCA9IGluZGVudCArICh1aVNvdXJjZUNvZGUuZGlzcGxh eU5hbWUgPyB1aVNvdXJjZUNvZGUuZGlzcGxheU5hbWUgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco Iihwcm9ncmFtKSIpKTsKLSAgICAgICAgICAgIG9wdGlvbi5uYW1lRm9yU29ydGluZyA9IGZvbGRl ck5hbWVGb3JTb3J0aW5nICsgIlx0L1x0IiArIHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZTsgLy8g VXNlICdcdCcgdG8gbWFrZSBmaWxlcyBzdGljayB0byB0aGVpciBmb2xkZXIuCisgICAgICAgICAg ICBvcHRpb24udGV4dCA9IGluZGVudCArIHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZTsKKyAgICAg ICAgICAgIG9wdGlvbi5uYW1lRm9yU29ydGluZyA9IGZvbGRlck5hbWVGb3JTb3J0aW5nICsgIlx0 L1x0IiArIHVpU291cmNlQ29kZS5maWxlTmFtZTsgLy8gVXNlICdcdCcgdG8gbWFrZSBmaWxlcyBz dGljayB0byB0aGVpciBmb2xkZXIuCiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBvcHRp b24udGV4dCA9IHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZSA/IHVpU291cmNlQ29kZS5kaXNwbGF5 TmFtZSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CisgICAgICAgICAgICBv cHRpb24udGV4dCA9IHVpU291cmNlQ29kZS5kaXNwbGF5TmFtZTsKICAgICAgICAgICAgIC8vIENv bnRlbnQgc2NyaXB0IHNob3VsZCBjb250YWluIGl0cyBkb21haW4gbmFtZSBhcyBhIHByZWZpeAog ICAgICAgICAgICAgaWYgKHVpU291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQgJiYgZm9sZGVyTmFt ZSkKICAgICAgICAgICAgICAgICBvcHRpb24udGV4dCA9IGZvbGRlck5hbWUgKyAiLyIgKyBvcHRp b24udGV4dDsKQEAgLTE0MTEsMyArMTQ2Niw5MSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZSA9IHsKIH0KIAogV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5Db21ib0JveEZpbGVTZWxlY3Rvci5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CisKKy8qKgorICogQGltcGxlbWVudHMge1dlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZUVkaXRvcn0KKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0 b3IuT2JqZWN0fQorICogQGNvbnN0cnVjdG9yCisgKi8KK1dlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwuU2luZ2xlRmlsZUVkaXRvciA9IGZ1bmN0aW9uKCkKK3sKKyAgICB0aGlzLmVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1l ID0gInNjcmlwdHMtdmlld3MtY29udGFpbmVyIjsKK30KKworV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5TaW5nbGVGaWxlRWRpdG9yLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAdHlw ZSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfQorICAgICAqLworICAgIGdldCBjdXJyZW50U291 cmNlRnJhbWUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRTb3VyY2VGcmFt ZTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtFbGVtZW50fSBlbGVtZW50Cisg ICAgICovCisgICAgc2hvdzogZnVuY3Rpb24oZWxlbWVudCkKKyAgICB7CisgICAgICAgIGVsZW1l bnQuYXBwZW5kQ2hpbGQodGhpcy5lbGVtZW50KTsKKyAgICB9LAorICAgIAorICAgIC8qKgorICAg ICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAgICAqLworICAgIHNob3dTb3VyY2VGcmFtZTogZnVu Y3Rpb24odGl0bGUsIHNvdXJjZUZyYW1lKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2N1cnJl bnRTb3VyY2VGcmFtZSA9PT0gc291cmNlRnJhbWUpCisgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgaWYgKHRoaXMuX2N1cnJlbnRTb3VyY2VGcmFtZSkKKyAgICAgICAgICAgIHRoaXMuX2N1 cnJlbnRTb3VyY2VGcmFtZS5kZXRhY2goKTsKKworICAgICAgICB0aGlzLl9jdXJyZW50U291cmNl RnJhbWUgPSBzb3VyY2VGcmFtZTsKKworICAgICAgICBpZiAoc291cmNlRnJhbWUpCisgICAgICAg ICAgICBzb3VyY2VGcmFtZS5zaG93KHRoaXMuZWxlbWVudCk7CisgICAgfSwKKworICAgIC8qKgor ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfSBzb3VyY2VGcmFtZQorICAg ICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgaXNTb3VyY2VGcmFtZU9wZW46IGZ1 bmN0aW9uKHNvdXJjZUZyYW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRT b3VyY2VGcmFtZSAmJiB0aGlzLl9jdXJyZW50U291cmNlRnJhbWUgPT09IHNvdXJjZUZyYW1lOwor ICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWU+fSBvbGRTb3VyY2VGcmFtZXMKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGl0bGUK KyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0gc291cmNlRnJhbWUKKyAg ICAgKi8KKyAgICByZXBsYWNlU291cmNlRnJhbWVzOiBmdW5jdGlvbihvbGRTb3VyY2VGcmFtZXMs IHRpdGxlLCBzb3VyY2VGcmFtZSkKKyAgICB7CisgICAgICAgIHRoaXMuX2N1cnJlbnRTb3VyY2VG cmFtZS5kZXRhY2goKTsKKyAgICAgICAgdGhpcy5fY3VycmVudFNvdXJjZUZyYW1lID0gbnVsbDsK KyAgICAgICAgdGhpcy5zaG93U291cmNlRnJhbWUodGl0bGUsIHNvdXJjZUZyYW1lKTsKKyAgICB9 LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9IHNv dXJjZUZyYW1lCisgICAgICogQHBhcmFtIHtib29sZWFufSBpc0RpcnR5CisgICAgICovCisgICAg c2V0U291cmNlRnJhbWVJc0RpcnR5OiBmdW5jdGlvbihzb3VyY2VGcmFtZSwgaXNEaXJ0eSkKKyAg ICB7CisgICAgICAgIC8vIERvIG5vdGhpbmcuCisgICAgfSwKKworICAgIHJlc2V0OiBmdW5jdGlv bigpCisgICAgeworICAgICAgICBpZiAodGhpcy5fY3VycmVudFNvdXJjZUZyYW1lKSB7CisgICAg ICAgICAgICB0aGlzLl9jdXJyZW50U291cmNlRnJhbWUuZGV0YWNoKCk7CisgICAgICAgICAgICB0 aGlzLl9jdXJyZW50U291cmNlRnJhbWUgPSBudWxsOworICAgICAgICB9CisgICAgfQorfQorCisK K1dlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuU2luZ2xlRmlsZUVkaXRvci5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IGZmZDY2MzY2 MjUzYzU3MjNmNDY5NzQ5NTllYTg3NzlmMGRjNjhlZTQuLjNmNmNiZmE4YmJhMzA1YzgzOTJkNjFm NjljMThhZmVlODZiNmIwM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC0xNDAsNiArMTQwLDE3IEBAIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEB0eXBlIHtzdHJp bmd9CiAgICAgICovCisgICAgZ2V0IGZpbGVOYW1lKCkKKyAgICB7CisgICAgICAgIGlmICghdGhp cy5fZmlsZU5hbWUpCisgICAgICAgICAgICB0aGlzLl9wYXJzZVVSTCgpOworICAgICAgICAKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2ZpbGVOYW1lOworICAgIH0sCisgICAgCisgICAgLyoqCisgICAg ICogQHR5cGUge3N0cmluZ30KKyAgICAgKi8KICAgICBnZXQgZGlzcGxheU5hbWUoKQogICAgIHsK ICAgICAgICAgaWYgKCF0aGlzLl9kaXNwbGF5TmFtZSkKQEAgLTE1NCwxOSArMTY1LDIyIEBAIFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdXJsID0g cGFyc2VkVVJMID8gcGFyc2VkVVJMLnBhdGggOiB0aGlzLnVybDsKIAogICAgICAgICB2YXIgZm9s ZGVyTmFtZSA9ICIiOwotICAgICAgICB2YXIgZGlzcGxheU5hbWUgPSB1cmw7CisgICAgICAgIHZh ciBmaWxlTmFtZSA9IHVybDsKIAotICAgICAgICB2YXIgcGF0aExlbmd0aCA9IGRpc3BsYXlOYW1l LmluZGV4T2YoIj8iKTsKKyAgICAgICAgdmFyIHBhdGhMZW5ndGggPSBmaWxlTmFtZS5pbmRleE9m KCI/Iik7CiAgICAgICAgIGlmIChwYXRoTGVuZ3RoID09PSAtMSkKLSAgICAgICAgICAgIHBhdGhM ZW5ndGggPSBkaXNwbGF5TmFtZS5sZW5ndGg7CisgICAgICAgICAgICBwYXRoTGVuZ3RoID0gZmls ZU5hbWUubGVuZ3RoOwogCi0gICAgICAgIHZhciBmcm9tSW5kZXggPSBkaXNwbGF5TmFtZS5sYXN0 SW5kZXhPZigiLyIsIHBhdGhMZW5ndGggLSAyKTsKKyAgICAgICAgdmFyIGZyb21JbmRleCA9IGZp bGVOYW1lLmxhc3RJbmRleE9mKCIvIiwgcGF0aExlbmd0aCAtIDIpOwogICAgICAgICBpZiAoZnJv bUluZGV4ICE9PSAtMSkgewotICAgICAgICAgICAgZm9sZGVyTmFtZSA9IGRpc3BsYXlOYW1lLnN1 YnN0cmluZygwLCBmcm9tSW5kZXgpOwotICAgICAgICAgICAgZGlzcGxheU5hbWUgPSBkaXNwbGF5 TmFtZS5zdWJzdHJpbmcoZnJvbUluZGV4ICsgMSk7CisgICAgICAgICAgICBmb2xkZXJOYW1lID0g ZmlsZU5hbWUuc3Vic3RyaW5nKDAsIGZyb21JbmRleCk7CisgICAgICAgICAgICBmaWxlTmFtZSA9 IGZpbGVOYW1lLnN1YnN0cmluZyhmcm9tSW5kZXggKyAxKTsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChkaXNwbGF5TmFtZS5sZW5ndGggPiA4MCkKKyAgICAgICAgdmFyIGRpc3BsYXlOYW1lID0g ZmlsZU5hbWU7CisgICAgICAgIGlmICghZGlzcGxheU5hbWUpCisgICAgICAgICAgICBkaXNwbGF5 TmFtZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7CisgICAgICAgIGVsc2Ug aWYgKGRpc3BsYXlOYW1lLmxlbmd0aCA+IDgwKQogICAgICAgICAgICAgZGlzcGxheU5hbWUgPSAi XHUyMDI2IiArIGRpc3BsYXlOYW1lLnN1YnN0cmluZyhkaXNwbGF5TmFtZS5sZW5ndGggLSA4MCk7 CiAKICAgICAgICAgaWYgKGZvbGRlck5hbWUubGVuZ3RoID4gODApCkBAIC0xNzQsNiArMTg4LDcg QEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhp cy5fZG9tYWluID0gcGFyc2VkVVJMID8gcGFyc2VkVVJMLmhvc3QgOiAiIjsKICAgICAgICAgdGhp cy5fZm9sZGVyTmFtZSA9IGZvbGRlck5hbWU7CisgICAgICAgIHRoaXMuX2ZpbGVOYW1lID0gZmls ZU5hbWU7CiAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gZGlzcGxheU5hbWU7CiAgICAgfSwK IAo=