89739 2012-06-21 23:00:35 -0700 Web Inspector: Add frontend-side Entry object to FileSystemModel 2012-06-22 05:36:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 68203 73301 87856 0 tzik tzik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 655251 0 tzik 2012-06-21 23:00:35 -0700 I'd like to add Entry, Directory and File object under FileSystemModel that represent browser side entries. It will provide handy way to manipulate entries. This is split out bug/patch from http://webkit.org/b/73301 (Web Inspector: Add FileSystemView). 655260 1 148965 tzik 2012-06-21 23:13:53 -0700 Created attachment 148965 Patch 655339 2 148965 vsevik 2012-06-22 03:08:22 -0700 Comment on attachment 148965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148965&action=review > Source/WebCore/inspector/front-end/FileSystemModel.js:287 > + get fileSystemModel() { return this._fileSystemModel; }, Here and below: get fileSystemModel() { return this._fileSystemModel; }, Also could you please add compiler annotations to getters (where possible). 655342 3 148989 tzik 2012-06-22 03:17:42 -0700 Created attachment 148989 Patch 655344 4 148965 tzik 2012-06-22 03:19:02 -0700 Comment on attachment 148965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148965&action=review >> Source/WebCore/inspector/front-end/FileSystemModel.js:287 >> + get fileSystemModel() { return this._fileSystemModel; }, > > Here and below: > > get fileSystemModel() > { > return this._fileSystemModel; > }, > > Also could you please add compiler annotations to getters (where possible). Done. 655378 5 148989 webkit.review.bot 2012-06-22 05:36:12 -0700 Comment on attachment 148989 Patch Clearing flags on attachment: 148989 Committed r121017: <http://trac.webkit.org/changeset/121017> 655379 6 webkit.review.bot 2012-06-22 05:36:16 -0700 All reviewed patches have been landed. Closing bug. 148965 2012-06-21 23:13:53 -0700 2012-06-22 03:19:02 -0700 Patch bug-89739-20120622151352.patch text/plain 6466 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwOTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFmNGYyMmE5MGQxNDlk ZDhjZDY2YjYwYmExODcwNzI4M2IzMWY3My4uMGRjZDExZjhhODJhN2IyMDdkNWZlMzk2MDdlMTEw YTdmMzM0OWZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA2LTIxICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZnJvbnRlbmQtc2lkZSBFbnRyeSBvYmplY3QgdG8gRmlsZVN5c3RlbU1vZGVsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTczOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWxlU3lzdGVtTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bU1vZGVsLnByb3RvdHlwZS5fZmlsZVN5c3RlbVJvb3RSZWNlaXZlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZS5yZXF1ZXN0RGlyZWN0b3J5Q29udGVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZS5fZGly ZWN0b3J5Q29udGVudFJlY2VpdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt TW9kZWwuRmlsZVN5c3RlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVs LkVudHJ5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkucHJv dG90eXBlLmdldCBmaWxlU3lzdGVtTW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUuZ2V0IGZpbGVTeXN0ZW0pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUuZ2V0IHVybCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlwZS5nZXQgbmFt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlw ZS5nZXQgaXNEaXJlY3RvcnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5EaXJlY3RvcnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5EaXJl Y3RvcnkucHJvdG90eXBlLnJlcXVlc3REaXJlY3RvcnlDb250ZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbU1vZGVsLkZpbGUucHJvdG90eXBlLmdldCBtaW1lVHlwZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGUucHJvdG90eXBlLmdldCByZXNvdXJjZVR5cGUp OgorCiAyMDEyLTA2LTIxICBPbGkgTGFuICA8b2xpbGFuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBBZGQgbWV0aG9kcyB0byBzZWxlY3QgYmV0d2VlbiBvZmZzZXRzIGluIGFuIGVkaXRhYmxlIGZp ZWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxl U3lzdGVtTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVT eXN0ZW1Nb2RlbC5qcwppbmRleCA1MThkYjc3MGUwZTJhYTRkZTM5ZTRlMWE0ZDM2ZDIwMDZlNjBj OTdjLi44NDM2MmQzNTM0NjEzYzMxYzE5MzRkMmY2NjkzYmFjZDYwM2Y2NThhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5q cwpAQCAtMjAyLDYgKzIwMiwzOSBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHN0b3JlW3R5cGVdID0gZmlsZVN5c3RlbTsKICAgICAgICAg ICAgIHRoaXMuX2ZpbGVTeXN0ZW1BZGRlZChmaWxlU3lzdGVtKTsKICAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwu RGlyZWN0b3J5fSBkaXJlY3RvcnkKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlciwgQXJy YXkuPFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnk+PSl9IGNhbGxiYWNrCisgICAg ICovCisgICAgcmVxdWVzdERpcmVjdG9yeUNvbnRlbnQ6IGZ1bmN0aW9uKGRpcmVjdG9yeSwgY2Fs bGJhY2spCisgICAgeworICAgICAgICB0aGlzLl9hZ2VudFdyYXBwZXIucmVxdWVzdERpcmVjdG9y eUNvbnRlbnQoZGlyZWN0b3J5LnVybCwgdGhpcy5fZGlyZWN0b3J5Q29udGVudFJlY2VpdmVkLmJp bmQodGhpcywgZGlyZWN0b3J5LCBjYWxsYmFjaykpOworICAgIH0sCisKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRGlyZWN0b3J5fSBwYXJlbnRE aXJlY3RvcnkKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlciwgQXJyYXkuPFdlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnk+PSl9IGNhbGxiYWNrCisgICAgICogQHBhcmFtIHtu dW1iZXJ9IGVycm9yQ29kZQorICAgICAqIEBwYXJhbSB7QXJyYXkuPEZpbGVTeXN0ZW1BZ2VudC5F bnRyeT49fSBiYWNrZW5kRW50cmllcworICAgICAqLworICAgIF9kaXJlY3RvcnlDb250ZW50UmVj ZWl2ZWQ6IGZ1bmN0aW9uKHBhcmVudERpcmVjdG9yeSwgY2FsbGJhY2ssIGVycm9yQ29kZSwgYmFj a2VuZEVudHJpZXMpCisgICAgeworICAgICAgICBpZiAoZXJyb3JDb2RlICE9PSAwKSB7CisgICAg ICAgICAgICBjYWxsYmFjayhlcnJvckNvZGUsIG51bGwpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKKyAgICAgICAgdmFyIGVudHJpZXMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBiYWNrZW5kRW50cmllcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgaWYg KGJhY2tlbmRFbnRyaWVzW2ldLmlzRGlyZWN0b3J5KQorICAgICAgICAgICAgICAgIGVudHJpZXMu cHVzaChuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5EaXJlY3RvcnkodGhpcywgcGFy ZW50RGlyZWN0b3J5LmZpbGVTeXN0ZW0sIGJhY2tlbmRFbnRyaWVzW2ldKSk7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgZW50cmllcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbU1vZGVsLkZpbGUodGhpcywgcGFyZW50RGlyZWN0b3J5LmZpbGVTeXN0ZW0sIGJhY2tl bmRFbnRyaWVzW2ldKSk7CisgICAgICAgIH0KKworICAgICAgICBjYWxsYmFjayhlcnJvckNvZGUs IGVudHJpZXMpOwogICAgIH0KIH0KIApAQCAtMjIzLDYgKzI1Niw4IEBAIFdlYkluc3BlY3Rvci5G aWxlU3lzdGVtTW9kZWwuRmlsZVN5c3RlbSA9IGZ1bmN0aW9uKGZpbGVTeXN0ZW1Nb2RlbCwgb3Jp Z2luLCB0eXBlCiB7CiAgICAgdGhpcy5vcmlnaW4gPSBvcmlnaW47CiAgICAgdGhpcy50eXBlID0g dHlwZTsKKworICAgIHRoaXMucm9vdCA9IG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVs LkRpcmVjdG9yeShmaWxlU3lzdGVtTW9kZWwsIHRoaXMsIGJhY2tlbmRSb290RW50cnkpOwogfQog CiBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0ZW0ucHJvdG90eXBlID0gewpA QCAtMjM0LDYgKzI2OSw3NyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0 ZW0ucHJvdG90eXBlID0gewogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsfSBmaWxlU3lzdGVtTW9kZWwKKyAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlU3lzdGVtfSBmaWxlU3lzdGVtCisgKiBAcGFy YW0ge0ZpbGVTeXN0ZW1BZ2VudC5FbnRyeX0gYmFja2VuZEVudHJ5CisgKi8KK1dlYkluc3BlY3Rv ci5GaWxlU3lzdGVtTW9kZWwuRW50cnkgPSBmdW5jdGlvbihmaWxlU3lzdGVtTW9kZWwsIGZpbGVT eXN0ZW0sIGJhY2tlbmRFbnRyeSkKK3sKKyAgICB0aGlzLl9maWxlU3lzdGVtTW9kZWwgPSBmaWxl U3lzdGVtTW9kZWw7CisgICAgdGhpcy5fZmlsZVN5c3RlbSA9IGZpbGVTeXN0ZW07CisKKyAgICB0 aGlzLl91cmwgPSBiYWNrZW5kRW50cnkudXJsOworICAgIHRoaXMuX25hbWUgPSBiYWNrZW5kRW50 cnkubmFtZTsKKyAgICB0aGlzLl9pc0RpcmVjdG9yeSA9IGJhY2tlbmRFbnRyeS5pc0RpcmVjdG9y eTsKK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUgPSB7 CisgICAgZ2V0IGZpbGVTeXN0ZW1Nb2RlbCgpIHsgcmV0dXJuIHRoaXMuX2ZpbGVTeXN0ZW1Nb2Rl bDsgfSwKKyAgICBnZXQgZmlsZVN5c3RlbSgpIHsgcmV0dXJuIHRoaXMuX2ZpbGVTeXN0ZW07IH0s CisKKyAgICBnZXQgdXJsKCkgeyByZXR1cm4gdGhpcy5fdXJsOyB9LAorICAgIGdldCBuYW1lKCkg eyByZXR1cm4gdGhpcy5fbmFtZTsgfSwKKyAgICBnZXQgaXNEaXJlY3RvcnkoKSB7IHJldHVybiB0 aGlzLl9pc0RpcmVjdG9yeTsgfQorfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVu ZHMge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnl9CisgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5GaWxlU3lzdGVtTW9kZWx9IGZpbGVTeXN0ZW1Nb2RlbAorICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0ZW19IGZpbGVTeXN0ZW0KKyAqIEBwYXJh bSB7RmlsZVN5c3RlbUFnZW50LkVudHJ5fSBiYWNrZW5kRW50cnkKKyAqLworV2ViSW5zcGVjdG9y LkZpbGVTeXN0ZW1Nb2RlbC5EaXJlY3RvcnkgPSBmdW5jdGlvbihmaWxlU3lzdGVtTW9kZWwsIGZp bGVTeXN0ZW0sIGJhY2tlbmRFbnRyeSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1v ZGVsLkVudHJ5LmNhbGwodGhpcywgZmlsZVN5c3RlbU1vZGVsLCBmaWxlU3lzdGVtLCBiYWNrZW5k RW50cnkpOworfQorCitXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkRpcmVjdG9yeS5wcm90 b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHBhcmFtIHtmdW5jdGlvbihudW1iZXIsIEFycmF5 LjxXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkRpcmVjdG9yeT4pfSBjYWxsYmFjaworICAg ICAqLworICAgIHJlcXVlc3REaXJlY3RvcnlDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKKyAg ICB7CisgICAgICAgIHRoaXMuZmlsZVN5c3RlbU1vZGVsLnJlcXVlc3REaXJlY3RvcnlDb250ZW50 KHRoaXMsIGNhbGxiYWNrKTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9k ZWwuRGlyZWN0b3J5LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bU1vZGVsLkVudHJ5LnByb3RvdHlwZTsKKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRl bmRzIHtXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5fQorICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsfSBmaWxlU3lzdGVtTW9kZWwKKyAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlU3lzdGVtfSBmaWxlU3lzdGVtCisgKiBAcGFy YW0ge0ZpbGVTeXN0ZW1BZ2VudC5FbnRyeX0gYmFja2VuZEVudHJ5CisgKi8KK1dlYkluc3BlY3Rv ci5GaWxlU3lzdGVtTW9kZWwuRmlsZSA9IGZ1bmN0aW9uKGZpbGVTeXN0ZW1Nb2RlbCwgZmlsZVN5 c3RlbSwgYmFja2VuZEVudHJ5KQoreworICAgIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwu RW50cnkuY2FsbCh0aGlzLCBmaWxlU3lzdGVtTW9kZWwsIGZpbGVTeXN0ZW0sIGJhY2tlbmRFbnRy eSk7CisKKyAgICB0aGlzLl9taW1lVHlwZSA9IGJhY2tlbmRFbnRyeS5taW1lVHlwZTsKKyAgICB0 aGlzLl9yZXNvdXJjZVR5cGUgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlc1tiYWNrZW5kRW50 cnkucmVzb3VyY2VUeXBlXTsKK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxl LnByb3RvdHlwZSA9IHsKKyAgICBnZXQgbWltZVR5cGUoKSB7IHJldHVybiB0aGlzLl9taW1lVHlw ZTsgfSwKKyAgICBnZXQgcmVzb3VyY2VUeXBlKCkgeyByZXR1cm4gdGhpcy5fcmVzb3VyY2VUeXBl OyB9Cit9CisKK1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRmlsZS5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGU7CisK Ky8qKgorICogQGNvbnN0cnVjdG9yCiAgKi8KIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtUmVxdWVz dE1hbmFnZXIgPSBmdW5jdGlvbigpCiB7Cg== 148989 2012-06-22 03:17:42 -0700 2012-06-22 05:36:12 -0700 Patch bug-89739-20120622191742.patch text/plain 7098 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwOTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFmNGYyMmE5MGQxNDlk ZDhjZDY2YjYwYmExODcwNzI4M2IzMWY3My4uMGRjZDExZjhhODJhN2IyMDdkNWZlMzk2MDdlMTEw YTdmMzM0OWZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA2LTIxICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgZnJvbnRlbmQtc2lkZSBFbnRyeSBvYmplY3QgdG8gRmlsZVN5c3RlbU1vZGVsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTczOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9GaWxlU3lzdGVtTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bU1vZGVsLnByb3RvdHlwZS5fZmlsZVN5c3RlbVJvb3RSZWNlaXZlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZS5yZXF1ZXN0RGlyZWN0b3J5Q29udGVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZS5fZGly ZWN0b3J5Q29udGVudFJlY2VpdmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt TW9kZWwuRmlsZVN5c3RlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVs LkVudHJ5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkucHJv dG90eXBlLmdldCBmaWxlU3lzdGVtTW9kZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUuZ2V0IGZpbGVTeXN0ZW0pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRyeS5wcm90b3R5cGUuZ2V0IHVybCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlwZS5nZXQgbmFt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlw ZS5nZXQgaXNEaXJlY3RvcnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5EaXJlY3RvcnkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5EaXJl Y3RvcnkucHJvdG90eXBlLnJlcXVlc3REaXJlY3RvcnlDb250ZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbU1vZGVsLkZpbGUucHJvdG90eXBlLmdldCBtaW1lVHlwZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGUucHJvdG90eXBlLmdldCByZXNvdXJjZVR5cGUp OgorCiAyMDEyLTA2LTIxICBPbGkgTGFuICA8b2xpbGFuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBBZGQgbWV0aG9kcyB0byBzZWxlY3QgYmV0d2VlbiBvZmZzZXRzIGluIGFuIGVkaXRhYmxlIGZp ZWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxl U3lzdGVtTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVT eXN0ZW1Nb2RlbC5qcwppbmRleCA1MThkYjc3MGUwZTJhYTRkZTM5ZTRlMWE0ZDM2ZDIwMDZlNjBj OTdjLi42NjFlOTE1ZmY3MTVjMjFhMmM1YmU1MDg4ZjQ1NzhhM2I3N2NhYzQ5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5q cwpAQCAtMjAyLDYgKzIwMiwzOSBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHN0b3JlW3R5cGVdID0gZmlsZVN5c3RlbTsKICAgICAgICAg ICAgIHRoaXMuX2ZpbGVTeXN0ZW1BZGRlZChmaWxlU3lzdGVtKTsKICAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwu RGlyZWN0b3J5fSBkaXJlY3RvcnkKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlciwgQXJy YXkuPFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnk+PSl9IGNhbGxiYWNrCisgICAg ICovCisgICAgcmVxdWVzdERpcmVjdG9yeUNvbnRlbnQ6IGZ1bmN0aW9uKGRpcmVjdG9yeSwgY2Fs bGJhY2spCisgICAgeworICAgICAgICB0aGlzLl9hZ2VudFdyYXBwZXIucmVxdWVzdERpcmVjdG9y eUNvbnRlbnQoZGlyZWN0b3J5LnVybCwgdGhpcy5fZGlyZWN0b3J5Q29udGVudFJlY2VpdmVkLmJp bmQodGhpcywgZGlyZWN0b3J5LCBjYWxsYmFjaykpOworICAgIH0sCisKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRGlyZWN0b3J5fSBwYXJlbnRE aXJlY3RvcnkKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlciwgQXJyYXkuPFdlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnk+PSl9IGNhbGxiYWNrCisgICAgICogQHBhcmFtIHtu dW1iZXJ9IGVycm9yQ29kZQorICAgICAqIEBwYXJhbSB7QXJyYXkuPEZpbGVTeXN0ZW1BZ2VudC5F bnRyeT49fSBiYWNrZW5kRW50cmllcworICAgICAqLworICAgIF9kaXJlY3RvcnlDb250ZW50UmVj ZWl2ZWQ6IGZ1bmN0aW9uKHBhcmVudERpcmVjdG9yeSwgY2FsbGJhY2ssIGVycm9yQ29kZSwgYmFj a2VuZEVudHJpZXMpCisgICAgeworICAgICAgICBpZiAoZXJyb3JDb2RlICE9PSAwKSB7CisgICAg ICAgICAgICBjYWxsYmFjayhlcnJvckNvZGUsIG51bGwpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKKyAgICAgICAgdmFyIGVudHJpZXMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBiYWNrZW5kRW50cmllcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgaWYg KGJhY2tlbmRFbnRyaWVzW2ldLmlzRGlyZWN0b3J5KQorICAgICAgICAgICAgICAgIGVudHJpZXMu cHVzaChuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5EaXJlY3RvcnkodGhpcywgcGFy ZW50RGlyZWN0b3J5LmZpbGVTeXN0ZW0sIGJhY2tlbmRFbnRyaWVzW2ldKSk7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgZW50cmllcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuRmls ZVN5c3RlbU1vZGVsLkZpbGUodGhpcywgcGFyZW50RGlyZWN0b3J5LmZpbGVTeXN0ZW0sIGJhY2tl bmRFbnRyaWVzW2ldKSk7CisgICAgICAgIH0KKworICAgICAgICBjYWxsYmFjayhlcnJvckNvZGUs IGVudHJpZXMpOwogICAgIH0KIH0KIApAQCAtMjIzLDkgKzI1NiwxNCBAQCBXZWJJbnNwZWN0b3Iu RmlsZVN5c3RlbU1vZGVsLkZpbGVTeXN0ZW0gPSBmdW5jdGlvbihmaWxlU3lzdGVtTW9kZWwsIG9y aWdpbiwgdHlwZQogewogICAgIHRoaXMub3JpZ2luID0gb3JpZ2luOwogICAgIHRoaXMudHlwZSA9 IHR5cGU7CisKKyAgICB0aGlzLnJvb3QgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5EaXJlY3RvcnkoZmlsZVN5c3RlbU1vZGVsLCB0aGlzLCBiYWNrZW5kUm9vdEVudHJ5KTsKIH0K IAogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlU3lzdGVtLnByb3RvdHlwZSA9IHsK KyAgICAvKioKKyAgICAgKiBAdHlwZSB7c3RyaW5nfQorICAgICAqLwogICAgIGdldCBuYW1lKCkK ICAgICB7CiAgICAgICAgIHJldHVybiAiZmlsZXN5c3RlbToiICsgdGhpcy5vcmlnaW4gKyAiLyIg KyB0aGlzLnR5cGU7CkBAIC0yMzQsNiArMjcyLDEyMyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bU1vZGVsLkZpbGVTeXN0ZW0ucHJvdG90eXBlID0gewogCiAvKioKICAqIEBjb25zdHJ1Y3Rvcgor ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsfSBmaWxlU3lzdGVtTW9kZWwK KyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlU3lzdGVtfSBmaWxl U3lzdGVtCisgKiBAcGFyYW0ge0ZpbGVTeXN0ZW1BZ2VudC5FbnRyeX0gYmFja2VuZEVudHJ5Cisg Ki8KK1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkgPSBmdW5jdGlvbihmaWxlU3lz dGVtTW9kZWwsIGZpbGVTeXN0ZW0sIGJhY2tlbmRFbnRyeSkKK3sKKyAgICB0aGlzLl9maWxlU3lz dGVtTW9kZWwgPSBmaWxlU3lzdGVtTW9kZWw7CisgICAgdGhpcy5fZmlsZVN5c3RlbSA9IGZpbGVT eXN0ZW07CisKKyAgICB0aGlzLl91cmwgPSBiYWNrZW5kRW50cnkudXJsOworICAgIHRoaXMuX25h bWUgPSBiYWNrZW5kRW50cnkubmFtZTsKKyAgICB0aGlzLl9pc0RpcmVjdG9yeSA9IGJhY2tlbmRF bnRyeS5pc0RpcmVjdG9yeTsKK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRy eS5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5GaWxl U3lzdGVtTW9kZWx9CisgICAgICovCisgICAgZ2V0IGZpbGVTeXN0ZW1Nb2RlbCgpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fZmlsZVN5c3RlbU1vZGVsOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlU3lzdGVtfQor ICAgICAqLworICAgIGdldCBmaWxlU3lzdGVtKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll9maWxlU3lzdGVtOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAdHlwZSB7c3RyaW5nfQor ICAgICAqLworICAgIGdldCB1cmwoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3VybDsK KyAgICB9LAorCisgICAgLyoqCisgICAgICogQHR5cGUge3N0cmluZ30KKyAgICAgKi8KKyAgICBn ZXQgbmFtZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbmFtZTsKKyAgICB9LAorCisg ICAgLyoqCisgICAgICogQHR5cGUge2Jvb2xlYW59CisgICAgICovCisgICAgZ2V0IGlzRGlyZWN0 b3J5KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9pc0RpcmVjdG9yeTsKKyAgICB9Cit9 CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1Nb2RlbC5FbnRyeX0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bH0gZmlsZVN5c3RlbU1vZGVsCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9k ZWwuRmlsZVN5c3RlbX0gZmlsZVN5c3RlbQorICogQHBhcmFtIHtGaWxlU3lzdGVtQWdlbnQuRW50 cnl9IGJhY2tlbmRFbnRyeQorICovCitXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkRpcmVj dG9yeSA9IGZ1bmN0aW9uKGZpbGVTeXN0ZW1Nb2RlbCwgZmlsZVN5c3RlbSwgYmFja2VuZEVudHJ5 KQoreworICAgIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkuY2FsbCh0aGlzLCBm aWxlU3lzdGVtTW9kZWwsIGZpbGVTeXN0ZW0sIGJhY2tlbmRFbnRyeSk7Cit9CisKK1dlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtTW9kZWwuRGlyZWN0b3J5LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAg ICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51bWJlciwgQXJyYXkuPFdlYkluc3BlY3Rvci5GaWxlU3lz dGVtTW9kZWwuRGlyZWN0b3J5Pil9IGNhbGxiYWNrCisgICAgICovCisgICAgcmVxdWVzdERpcmVj dG9yeUNvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5maWxl U3lzdGVtTW9kZWwucmVxdWVzdERpcmVjdG9yeUNvbnRlbnQodGhpcywgY2FsbGJhY2spOworICAg IH0KK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5EaXJlY3RvcnkucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwuRW50cnkucHJvdG90eXBl OworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5GaWxl U3lzdGVtTW9kZWwuRW50cnl9CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9k ZWx9IGZpbGVTeXN0ZW1Nb2RlbAorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1v ZGVsLkZpbGVTeXN0ZW19IGZpbGVTeXN0ZW0KKyAqIEBwYXJhbSB7RmlsZVN5c3RlbUFnZW50LkVu dHJ5fSBiYWNrZW5kRW50cnkKKyAqLworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxl ID0gZnVuY3Rpb24oZmlsZVN5c3RlbU1vZGVsLCBmaWxlU3lzdGVtLCBiYWNrZW5kRW50cnkpCit7 CisgICAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5FbnRyeS5jYWxsKHRoaXMsIGZpbGVT eXN0ZW1Nb2RlbCwgZmlsZVN5c3RlbSwgYmFja2VuZEVudHJ5KTsKKworICAgIHRoaXMuX21pbWVU eXBlID0gYmFja2VuZEVudHJ5Lm1pbWVUeXBlOworICAgIHRoaXMuX3Jlc291cmNlVHlwZSA9IFdl Ykluc3BlY3Rvci5yZXNvdXJjZVR5cGVzW2JhY2tlbmRFbnRyeS5yZXNvdXJjZVR5cGVdOworfQor CitXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkZpbGUucHJvdG90eXBlID0geworICAgIC8q KgorICAgICAqIEB0eXBlIHtzdHJpbmd9CisgICAgICovCisgICAgZ2V0IG1pbWVUeXBlKCkKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9taW1lVHlwZTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGV9CisgICAgICovCisgICAgZ2V0 IHJlc291cmNlVHlwZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2VUeXBl OworICAgIH0KK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5GaWxlLnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5LnByb3RvdHlw ZTsKKworLyoqCisgKiBAY29uc3RydWN0b3IKICAqLwogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1S ZXF1ZXN0TWFuYWdlciA9IGZ1bmN0aW9uKCkKIHsK