14265 2007-06-20 22:51:16 -0700 Cannot resize columns in webinspector 2007-10-25 19:01:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 523.x (Safari 3) All All RESOLVED FIXED P2 Normal --- 1 info webkit-unassigned aroben dev+webkit sjoerd timothy oldest_to_newest 6948 0 info 2007-06-20 22:51:16 -0700 It is not possible to resize the left column even though there is a resize widget on the right-bottom of the left column. It simply doesn't do anything. 6642 1 15190 dev+webkit 2007-06-22 22:12:34 -0700 Created attachment 15190 Patch 6643 2 15190 timothy 2007-06-22 22:31:17 -0700 Comment on attachment 15190 Patch +function dividerDragEnd(element, dividerDrag, dividerDragEnd, event) You should put these functions in the WebInspector "namespace" like the other functions. Also the CSS for the sidebarResizeWidget should have cursor: col-resize; Otherwise this is a r=me. We still want to make resizing work by hovering over the divider line. 6449 3 15207 dev+webkit 2007-06-24 12:16:32 -0700 Created attachment 15207 Patch v2 6451 4 15207 timothy 2007-06-24 12:21:42 -0700 Comment on attachment 15207 Patch v2 r=me 6452 5 dev+webkit 2007-06-24 12:24:55 -0700 r23753 6453 6 dev+webkit 2007-06-24 12:26:45 -0700 Reopening until other areas are resizable 6375 7 15207 mrowe 2007-06-25 03:25:03 -0700 Comment on attachment 15207 Patch v2 Clearing review flag on landed patch to get it out of the commit queue. 2657 8 15897 sjoerd 2007-08-10 04:44:24 -0700 Created attachment 15897 Resizing of styles sidebar This enables resizing the right-hand column and makes sure that when dragging is done the relevant areas will remain the correct sizes when resizing the window. 2661 9 15899 sjoerd 2007-08-10 06:06:24 -0700 Created attachment 15899 Resizing of styles sidebar v2 Enable the resizing of the styles sidebar in the inspector. Fixes a bug introduced in previous patch where the resize widget would be unaccessible when the sidebar contains a scrollbar. 2655 10 dev+webkit 2007-08-10 06:18:19 -0700 (In reply to comment #9) > Created an attachment (id=15899) [edit] > Resizing of styles sidebar v2 > > Enable the resizing of the styles sidebar in the inspector. Fixes a bug > introduced in previous patch where the resize widget would be unaccessible when > the sidebar contains a scrollbar. > I'm not a reviewer so I can't r- this, but I do see a few problems: - The width of the resized column should be constrained, right now you can drag it all the way past the edge of the window in both directions. - While not the most intuitive way to resize things, the borders of the columns should be able to resize the column as well (like in iTunes). You need this for the right hand column especially, since right now the bread crumb trail doesn't restrict itself to the available space and inspecting a deeply nested area of the page won't show the resize handle. - You can't rely on IDs to resize the right column because there could be multiple documents which all have their own sidebar. When there are multiple documents, we don't reuse the same right hand sidebar and source view thingy, but create new ones because of the back/forward feature. Try going to a page with frames (ie: GMail) and you'll see that you can only resize one column. - In cases like GMail that have multiple documents, resizing one column should resize them all so that the size doesn't jump when switching between documents. - You should fill in your email address in the ChangeLog. * Unrelated and this is something for a followup patch, but we should really rename the left-hand sidebar to sourcelist or something else, because not only does having multiple meanings of "sidebar" in the source make it confusing to work on at times, but confusing to talk about as well. 2613 11 15899 aroben 2007-08-10 11:04:59 -0700 Comment on attachment 15899 Resizing of styles sidebar v2 There are some extraneous whitespace changes towards the beginning of the patch that shouldn't be in here. r- until you address Matt's comments. 2608 12 15899 timothy 2007-08-10 11:41:07 -0700 Comment on attachment 15899 Resizing of styles sidebar v2 + this.views.dom.contentElement.sideContentElement.id = "treeOutline"; + this.views.dom.contentElement.mainResizeWidget.id = "mainResizeWidget"; + this.views.dom.contentElement.sidebarElement.id = "propertiesSidebar"; You cannot assign id's to these elements. These elements are created for each file in the inspector. And id's need to be only used once in the document. You will not get the element you expect when doing document.getElementById(). + document.getElementById("mainResizeWidget").addEventListener("mousedown", WebInspector.mainResizerDragStart, true); This code should be: this.views.dom.contentElement.mainResizeWidget.addEventListener("mousedown", WebInspector.mainResizerDragStart, true); I also don't think we should have a resize widget in the corner. Resizing by the divider line is all we need. The divider line is only 1px wide, so a drag area of 5px (2px on each side, 1px in the center) would be good. Resizing by the divider is something we are still missing on the file list sidebar, mainly because this isn't trivial to fix. 2534 13 sjoerd 2007-08-11 07:12:05 -0700 Ok. Work to be done than. ;-) For dragging by the divider, would something like this be good? http://www.sjoerdtieleman.nl/divider/ This basically puts an absolute positioned div with a 5px wide png background on the resizable area. The png has 2px on the left and 2px on the right of transparancy, so the divider appears 5px wide for the mouse, but only 1px visually. If such a thing were to be done, would the current resize widgets be removed alltogether? 2525 14 timothy 2007-08-11 08:29:14 -0700 Yeah that is the basic idea. Except there is no need for a 5px image. The divv can just be 5px wide and have no style, so it is transparent. I will just be used for the mousedown event, etc. (Transparent divs still get events,) I think the resize widget can be left out for the right sidebar. 2505 15 aroben 2007-08-11 12:59:27 -0700 You should have a look at how resizing already works for the left column. I should think that a lot of the code could be shared. 59481 16 aroben 2007-10-25 19:01:09 -0700 Fixed in r26922 <http://trac.webkit.org/projects/webkit/changeset/26922> 15190 2007-06-22 22:12:34 -0700 2007-06-24 12:16:32 -0700 Patch SidebarResizePatch text/plain 5293 dev+webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzc0NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDctMDYtMjMgIE1hdHQgTGlsZWsgIDxwZXd0ZXJtb29zZUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW5zcGVjdG9yIHNpZGViYXIgcmVzaXppbmcuCisKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuY3NzOgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sOgor ICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qczoKKwogMjAwNy0wNi0yMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluLgpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwkocmV2aXNpb24g MjM3NDcpCisrKyBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MJKHdvcmtpbmcg Y29weSkKQEAgLTI3NCwxMSArMjc0LDE5IEBAIGJvZHkuaW5hY3RpdmUgI3NpZGViYXIgewogICAg IGhlaWdodDogMjFweDsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgI2JiYjsKICAgICAtd2Vi a2l0LWJveC1zaXppbmc6IGJvcmRlci1ib3g7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKElt YWdlcy9zaWRlYmFyUmVzaXplV2lkZ2V0LnBuZyksIHVybChJbWFnZXMvc2lkZWJhclN0YXR1c0Fy ZWFCYWNrZ3JvdW5kLnBuZyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9zaWRl YmFyU3RhdHVzQXJlYUJhY2tncm91bmQucG5nKTsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBy aWdodCwgY2VudGVyOwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQsIHJlcGVhdC14 OwogfQogCisjc3RhdHVzYmFyICNzaWRlYmFyUmVzaXplV2lkZ2V0IHsKKyAgICBkaXNwbGF5OiBi bG9jazsKKyAgICBmbG9hdDogcmlnaHQ7CisgICAgd2lkdGg6IDE3cHg7CisgICAgaGVpZ2h0OiAy MHB4OworICAgIGJhY2tncm91bmQ6IHVybChJbWFnZXMvc2lkZWJhclJlc2l6ZVdpZGdldC5wbmcp IHJpZ2h0IG5vLXJlcGVhdDsKK30KKwogI3N0YXR1c2JhciBidXR0b24gewogICAgIC13ZWJraXQt YXBlYXJhbmNlOiBub25lOwogICAgIHZlcnRpY2FsLWFsaWduOiB0b3A7CkluZGV4OiBXZWJDb3Jl L3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwJKHJldmlzaW9uIDIzNzQ3KQorKysgV2ViQ29yZS9w YWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNDksNyArNDks MTAgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQTwogICAgIDxkaXYg aWQ9InNpZGViYXIiIGNsYXNzPSJmb2N1c2FibGUgZm9jdXNlZCI+CiAgICAgICAgIDxvbCBpZD0i bGlzdCI+PC9vbD4KICAgICAgICAgPG9sIGlkPSJzdGF0dXMiPjwvb2w+Ci0gICAgICAgIDxkaXYg aWQ9InN0YXR1c2JhciI+PGJ1dHRvbiBpZD0ic3RhdHVzVG9nZ2xlIj48L2J1dHRvbj48YnV0dG9u IGlkPSJhdHRhY2hUb2dnbGUiPjwvYnV0dG9uPjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJzdGF0 dXNiYXIiPgorICAgICAgICAgICAgPGJ1dHRvbiBpZD0ic3RhdHVzVG9nZ2xlIj48L2J1dHRvbj48 YnV0dG9uIGlkPSJhdHRhY2hUb2dnbGUiPjwvYnV0dG9uPgorICAgICAgICAgICAgPHNwYW4gaWQ9 InNpZGViYXJSZXNpemVXaWRnZXQiPjwvc3Bhbj4KKyAgICAgICAgPC9kaXY+CiAgICAgPC9kaXY+ CiAgICAgPGRpdiBpZD0ic2VhcmNoUmVzdWx0cyIgY2xhc3M9ImZvY3VzYWJsZSI+PC9kaXY+CiAg ICAgPGRpdiBpZD0ibWFpbiIgY2xhc3M9ImZvY3VzYWJsZSBibHVycmVkIj48L2Rpdj4KSW5kZXg6 IFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCShyZXZpc2lvbiAyMzc0NykKKysrIFdlYkNv cmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMzUsNiAr MjM1LDcgQEAgV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKGV2ZW50KQogCiAgICAgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImF0dGFjaFRvZ2dsZSIpLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgZnVuY3Rpb24oZXZlbnQpIHsgV2ViSW5zcGVjdG9yLnRvZ2dsZUF0dGFjaCgpIH0sIHRy dWUpOwogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdGF0dXNUb2dnbGUiKS5hZGRFdmVu dExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKGV2ZW50KSB7IFdlYkluc3BlY3Rvci50b2dnbGVT dGF0dXNBcmVhKCkgfSwgdHJ1ZSk7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNpZGVi YXJSZXNpemVXaWRnZXQiKS5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCBmdW5jdGlvbihl dmVudCkgeyBXZWJJbnNwZWN0b3Iuc2lkZWJhclJlc2l6ZXJEcmFnU3RhcnQoZXZlbnQpIH0sIHRy dWUpOwogCiAgICAgZG9jdW1lbnQuYm9keS5hZGRTdHlsZUNsYXNzKCJkZXRhY2hlZCIpOwogCkBA IC00MzAsNiArNDMxLDY3IEBAIFdlYkluc3BlY3Rvci50b2dnbGVTdGF0dXNBcmVhID0gZnVuY3Rp b24KICAgICB0aGlzLnNob3dpbmdTdGF0dXNBcmVhID0gIXRoaXMuc2hvd2luZ1N0YXR1c0FyZWE7 CiB9CiAKK1dlYkluc3BlY3Rvci5zaWRlYmFyUmVzaXplckRyYWdTdGFydCA9IGZ1bmN0aW9uKGV2 ZW50KQoreworICAgIGRpdmlkZXJEcmFnU3RhcnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNp ZGViYXIiKSwgV2ViSW5zcGVjdG9yLnNpZGViYXJSZXNpemVyRHJhZywgV2ViSW5zcGVjdG9yLnNp ZGViYXJSZXNpemVyRHJhZ0VuZCwgZXZlbnQsICJjb2wtcmVzaXplIik7Cit9CisKK1dlYkluc3Bl Y3Rvci5zaWRlYmFyUmVzaXplckRyYWdFbmQgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBkaXZp ZGVyRHJhZ0VuZChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2lkZWJhciIpLCBXZWJJbnNwZWN0 b3Iuc2lkZWJhclJlc2l6ZXJEcmFnLCBXZWJJbnNwZWN0b3Iuc2lkZWJhclJlc2l6ZXJEcmFnRW5k LCBldmVudCk7Cit9CisKK1dlYkluc3BlY3Rvci5zaWRlYmFyUmVzaXplckRyYWcgPSBmdW5jdGlv bihldmVudCkKK3sKKyAgICB2YXIgc2lkZWJhciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJz aWRlYmFyIik7CisgICAgaWYgKHNpZGViYXIuZHJhZ2dpbmcgPT0gdHJ1ZSkgeworICAgICAgICB2 YXIgbWFpbiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtYWluIik7CisKKyAgICAgICAgdmFy IHggPSBldmVudC5jbGllbnRYICsgd2luZG93LnNjcm9sbFg7CisgICAgICAgIHZhciBkZWx0YSA9 IHNpZGViYXIuZHJhZ0xhc3RYIC0geDsKKyAgICAgICAgdmFyIG5ld1dpZHRoID0gY29uc3RyYWlu ZWRXaWR0aEZyb21FbGVtZW50KHgsIG1haW4pOworCisgICAgICAgIGlmICh4ID09IG5ld1dpZHRo KQorICAgICAgICAgICAgc2lkZWJhci5kcmFnTGFzdFggPSB4OworCisgICAgICAgIHNpZGViYXIu c3R5bGUud2lkdGggPSBuZXdXaWR0aCArICJweCI7CisgICAgICAgIG1haW4uc3R5bGUubGVmdCA9 IG5ld1dpZHRoICsgInB4IjsKKyAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICB9 Cit9CisKK2Z1bmN0aW9uIGRpdmlkZXJEcmFnU3RhcnQoZWxlbWVudCwgZGl2aWRlckRyYWcsIGRp dmlkZXJEcmFnRW5kLCBldmVudCwgY3Vyc29yKSAKK3sKKyAgICBlbGVtZW50LmRyYWdnaW5nID0g dHJ1ZTsKKyAgICBlbGVtZW50LmRyYWdMYXN0WSA9IGV2ZW50LmNsaWVudFkgKyB3aW5kb3cuc2Ny b2xsWTsKKyAgICBlbGVtZW50LmRyYWdMYXN0WCA9IGV2ZW50LmNsaWVudFggKyB3aW5kb3cuc2Ny b2xsWDsKKyAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCBkaXZpZGVy RHJhZywgdHJ1ZSk7CisgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIGRp dmlkZXJEcmFnRW5kLCB0cnVlKTsKKyAgICBkb2N1bWVudC5ib2R5LnN0eWxlLmN1cnNvciA9IGN1 cnNvcjsKKyAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworfQorCitmdW5jdGlvbiBkaXZpZGVy RHJhZ0VuZChlbGVtZW50LCBkaXZpZGVyRHJhZywgZGl2aWRlckRyYWdFbmQsIGV2ZW50KSAKK3sK KyAgICBlbGVtZW50LmRyYWdnaW5nID0gZmFsc2U7CisgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRM aXN0ZW5lcigibW91c2Vtb3ZlIiwgZGl2aWRlckRyYWcsIHRydWUpOworICAgIGRvY3VtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCBkaXZpZGVyRHJhZ0VuZCwgdHJ1ZSk7CisgICAg ZG9jdW1lbnQuYm9keS5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiY3Vyc29yIik7Cit9CisKK2Z1bmN0 aW9uIGNvbnN0cmFpbmVkV2lkdGhGcm9tRWxlbWVudCh3aWR0aCwgZWxlbWVudCwgY29uc3RyYWlu TGVmdCwgY29uc3RyYWluUmlnaHQpIAoreworICAgIGlmIChjb25zdHJhaW5MZWZ0ID09PSB1bmRl ZmluZWQpIGNvbnN0cmFpbkxlZnQgPSAwLjI1OworICAgIGlmIChjb25zdHJhaW5SaWdodCA9PT0g dW5kZWZpbmVkKSBjb25zdHJhaW5SaWdodCA9IDAuNzU7CisKKyAgICBpZiAod2lkdGggPCBlbGVt ZW50LmNsaWVudFdpZHRoICogY29uc3RyYWluTGVmdCkKKyAgICAgICAgd2lkdGggPSAyMDA7Cisg ICAgZWxzZSBpZiAod2lkdGggPiBlbGVtZW50LmNsaWVudFdpZHRoICogY29uc3RyYWluUmlnaHQp CisgICAgICAgIHdpZHRoID0gZWxlbWVudC5jbGllbnRXaWR0aCAqIGNvbnN0cmFpblJpZ2h0Owor CisgICAgcmV0dXJuIHdpZHRoOworfQorCiBXZWJJbnNwZWN0b3IuYmFjayA9IGZ1bmN0aW9uKCkK IHsKICAgICBpZiAodGhpcy5jdXJyZW50QmFja0ZvcndhcmRJbmRleCA8PSAwKSB7Cg== 15207 2007-06-24 12:16:32 -0700 2007-06-25 03:25:03 -0700 Patch v2 SidebarResizePatch-3 text/plain 5764 dev+webkit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDctMDYtMjQgIE1hdHQgTGlsZWsgIDxwZXd0ZXJtb29zZUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVnIDE0MjY1OiBDYW5ub3QgcmVzaXplIGNvbHVtbnMgaW4gd2ViaW5zcGVjdG9yCisgICAgICAg IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjY1CisKKyAgICAgICAg KiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzOgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9y L2luc3BlY3Rvci5odG1sOgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qczoK KwogMjAwNy0wNi0yMyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAg U2lsZW5jZSBhIGJ1aWxkIHdhcm5pbmcgYWJvdXQgbm90IGZpbmRpbmcgYG51bS1jcHVzYApJbmRl eDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwkocmV2aXNpb24gMjM3NTIpCisrKyBX ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTI3 NCwxMSArMjc0LDIwIEBAIGJvZHkuaW5hY3RpdmUgI3NpZGViYXIgewogICAgIGhlaWdodDogMjFw eDsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgI2JiYjsKICAgICAtd2Via2l0LWJveC1zaXpp bmc6IGJvcmRlci1ib3g7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9zaWRlYmFy UmVzaXplV2lkZ2V0LnBuZyksIHVybChJbWFnZXMvc2lkZWJhclN0YXR1c0FyZWFCYWNrZ3JvdW5k LnBuZyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9zaWRlYmFyU3RhdHVzQXJl YUJhY2tncm91bmQucG5nKTsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiByaWdodCwgY2VudGVy OwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQsIHJlcGVhdC14OwogfQogCisjc3Rh dHVzYmFyICNzaWRlYmFyUmVzaXplV2lkZ2V0IHsKKyAgICBkaXNwbGF5OiBibG9jazsKKyAgICBm bG9hdDogcmlnaHQ7CisgICAgd2lkdGg6IDE3cHg7CisgICAgaGVpZ2h0OiAyMHB4OworICAgIGJh Y2tncm91bmQ6IHVybChJbWFnZXMvc2lkZWJhclJlc2l6ZVdpZGdldC5wbmcpIHJpZ2h0IG5vLXJl cGVhdDsKKyAgICBjdXJzb3I6IGNvbC1yZXNpemU7Cit9CisKICNzdGF0dXNiYXIgYnV0dG9uIHsK ICAgICAtd2Via2l0LWFwZWFyYW5jZTogbm9uZTsKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwpJ bmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sCShyZXZpc2lvbiAyMzc1MikK KysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwJKHdvcmtpbmcgY29weSkK QEAgLTQ5LDcgKzQ5LDEwIEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE8KICAgICA8ZGl2IGlkPSJzaWRlYmFyIiBjbGFzcz0iZm9jdXNhYmxlIGZvY3VzZWQiPgogICAg ICAgICA8b2wgaWQ9Imxpc3QiPjwvb2w+CiAgICAgICAgIDxvbCBpZD0ic3RhdHVzIj48L29sPgot ICAgICAgICA8ZGl2IGlkPSJzdGF0dXNiYXIiPjxidXR0b24gaWQ9InN0YXR1c1RvZ2dsZSI+PC9i dXR0b24+PGJ1dHRvbiBpZD0iYXR0YWNoVG9nZ2xlIj48L2J1dHRvbj48L2Rpdj4KKyAgICAgICAg PGRpdiBpZD0ic3RhdHVzYmFyIj4KKyAgICAgICAgICAgIDxidXR0b24gaWQ9InN0YXR1c1RvZ2ds ZSI+PC9idXR0b24+PGJ1dHRvbiBpZD0iYXR0YWNoVG9nZ2xlIj48L2J1dHRvbj4KKyAgICAgICAg ICAgIDxzcGFuIGlkPSJzaWRlYmFyUmVzaXplV2lkZ2V0Ij48L3NwYW4+CisgICAgICAgIDwvZGl2 PgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9InNlYXJjaFJlc3VsdHMiIGNsYXNzPSJmb2N1c2Fi bGUiPjwvZGl2PgogICAgIDxkaXYgaWQ9Im1haW4iIGNsYXNzPSJmb2N1c2FibGUgYmx1cnJlZCI+ PC9kaXY+CkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwkocmV2aXNpb24gMjM3 NTIpCisrKyBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwkod29ya2luZyBjb3B5 KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUg SW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNyBNYXR0IExp bGVrIChwZXd0ZXJtb29zZUBnbWFpbC5jb20pLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0yMzUsNiArMjM2LDcgQEAgV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKGV2 ZW50KQogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImF0dGFjaFRvZ2dsZSIpLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgZnVuY3Rpb24oZXZlbnQpIHsgV2ViSW5zcGVjdG9yLnRvZ2ds ZUF0dGFjaCgpIH0sIHRydWUpOwogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdGF0dXNU b2dnbGUiKS5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGZ1bmN0aW9uKGV2ZW50KSB7IFdlYklu c3BlY3Rvci50b2dnbGVTdGF0dXNBcmVhKCkgfSwgdHJ1ZSk7CisgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInNpZGViYXJSZXNpemVXaWRnZXQiKS5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRv d24iLCBXZWJJbnNwZWN0b3Iuc2lkZWJhclJlc2l6ZXJEcmFnU3RhcnQsIHRydWUpOwogCiAgICAg ZG9jdW1lbnQuYm9keS5hZGRTdHlsZUNsYXNzKCJkZXRhY2hlZCIpOwogCkBAIC00MzAsNiArNDMy LDY3IEBAIFdlYkluc3BlY3Rvci50b2dnbGVTdGF0dXNBcmVhID0gZnVuY3Rpb24KICAgICB0aGlz LnNob3dpbmdTdGF0dXNBcmVhID0gIXRoaXMuc2hvd2luZ1N0YXR1c0FyZWE7CiB9CiAKK1dlYklu c3BlY3Rvci5zaWRlYmFyUmVzaXplckRyYWdTdGFydCA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAg IFdlYkluc3BlY3Rvci5kaXZpZGVyRHJhZ1N0YXJ0KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJz aWRlYmFyIiksIFdlYkluc3BlY3Rvci5zaWRlYmFyUmVzaXplckRyYWcsIFdlYkluc3BlY3Rvci5z aWRlYmFyUmVzaXplckRyYWdFbmQsIGV2ZW50LCAiY29sLXJlc2l6ZSIpOworfQorCitXZWJJbnNw ZWN0b3Iuc2lkZWJhclJlc2l6ZXJEcmFnRW5kID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgV2Vi SW5zcGVjdG9yLmRpdmlkZXJEcmFnRW5kKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzaWRlYmFy IiksIFdlYkluc3BlY3Rvci5zaWRlYmFyUmVzaXplckRyYWcsIFdlYkluc3BlY3Rvci5zaWRlYmFy UmVzaXplckRyYWdFbmQsIGV2ZW50KTsKK30KKworV2ViSW5zcGVjdG9yLnNpZGViYXJSZXNpemVy RHJhZyA9IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIHZhciBzaWRlYmFyID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInNpZGViYXIiKTsKKyAgICBpZiAoc2lkZWJhci5kcmFnZ2luZyA9PSB0cnVl KSB7CisgICAgICAgIHZhciBtYWluID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1haW4iKTsK KworICAgICAgICB2YXIgeCA9IGV2ZW50LmNsaWVudFggKyB3aW5kb3cuc2Nyb2xsWDsKKyAgICAg ICAgdmFyIGRlbHRhID0gc2lkZWJhci5kcmFnTGFzdFggLSB4OworICAgICAgICB2YXIgbmV3V2lk dGggPSBXZWJJbnNwZWN0b3IuY29uc3RyYWluZWRXaWR0aEZyb21FbGVtZW50KHgsIG1haW4pOwor CisgICAgICAgIGlmICh4ID09IG5ld1dpZHRoKQorICAgICAgICAgICAgc2lkZWJhci5kcmFnTGFz dFggPSB4OworCisgICAgICAgIHNpZGViYXIuc3R5bGUud2lkdGggPSBuZXdXaWR0aCArICJweCI7 CisgICAgICAgIG1haW4uc3R5bGUubGVmdCA9IG5ld1dpZHRoICsgInB4IjsKKyAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5kaXZpZGVyRHJh Z1N0YXJ0ID0gZnVuY3Rpb24oZWxlbWVudCwgZGl2aWRlckRyYWcsIGRpdmlkZXJEcmFnRW5kLCBl dmVudCwgY3Vyc29yKSAKK3sKKyAgICBlbGVtZW50LmRyYWdnaW5nID0gdHJ1ZTsKKyAgICBlbGVt ZW50LmRyYWdMYXN0WSA9IGV2ZW50LmNsaWVudFkgKyB3aW5kb3cuc2Nyb2xsWTsKKyAgICBlbGVt ZW50LmRyYWdMYXN0WCA9IGV2ZW50LmNsaWVudFggKyB3aW5kb3cuc2Nyb2xsWDsKKyAgICBkb2N1 bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCBkaXZpZGVyRHJhZywgdHJ1ZSk7Cisg ICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIGRpdmlkZXJEcmFnRW5kLCB0 cnVlKTsKKyAgICBkb2N1bWVudC5ib2R5LnN0eWxlLmN1cnNvciA9IGN1cnNvcjsKKyAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworfQorCitXZWJJbnNwZWN0b3IuZGl2aWRlckRyYWdFbmQgPSBm dW5jdGlvbihlbGVtZW50LCBkaXZpZGVyRHJhZywgZGl2aWRlckRyYWdFbmQsIGV2ZW50KSAKK3sK KyAgICBlbGVtZW50LmRyYWdnaW5nID0gZmFsc2U7CisgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRM aXN0ZW5lcigibW91c2Vtb3ZlIiwgZGl2aWRlckRyYWcsIHRydWUpOworICAgIGRvY3VtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCBkaXZpZGVyRHJhZ0VuZCwgdHJ1ZSk7CisgICAg ZG9jdW1lbnQuYm9keS5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiY3Vyc29yIik7Cit9CisKK1dlYklu c3BlY3Rvci5jb25zdHJhaW5lZFdpZHRoRnJvbUVsZW1lbnQgPSBmdW5jdGlvbih3aWR0aCwgZWxl bWVudCwgY29uc3RyYWluTGVmdCwgY29uc3RyYWluUmlnaHQpIAoreworICAgIGlmIChjb25zdHJh aW5MZWZ0ID09PSB1bmRlZmluZWQpIGNvbnN0cmFpbkxlZnQgPSAwLjI1OworICAgIGlmIChjb25z dHJhaW5SaWdodCA9PT0gdW5kZWZpbmVkKSBjb25zdHJhaW5SaWdodCA9IDAuNzU7CisKKyAgICBp ZiAod2lkdGggPCBlbGVtZW50LmNsaWVudFdpZHRoICogY29uc3RyYWluTGVmdCkKKyAgICAgICAg d2lkdGggPSAyMDA7CisgICAgZWxzZSBpZiAod2lkdGggPiBlbGVtZW50LmNsaWVudFdpZHRoICog Y29uc3RyYWluUmlnaHQpCisgICAgICAgIHdpZHRoID0gZWxlbWVudC5jbGllbnRXaWR0aCAqIGNv bnN0cmFpblJpZ2h0OworCisgICAgcmV0dXJuIHdpZHRoOworfQorCiBXZWJJbnNwZWN0b3IuYmFj ayA9IGZ1bmN0aW9uKCkKIHsKICAgICBpZiAodGhpcy5jdXJyZW50QmFja0ZvcndhcmRJbmRleCA8 PSAwKSB7Cg== 15897 2007-08-10 04:44:24 -0700 2007-08-10 06:06:24 -0700 Resizing of styles sidebar patch text/plain 6463 sjoerd SW5kZXg6IFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VQYW5lbC5qcwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlUGFuZWwuanMJKHJldmlzaW9uIDI0 OTc3KQorKysgV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZVBhbmVsLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0yMzEsMTAgKzIzMSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VQYW5lbC5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50 LnNpZGVDb250ZW50RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAg ICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZUNvbnRlbnRFbGVtZW50 LmNsYXNzTmFtZSA9ICJjb250ZW50IHNpZGUiOwotCisgICAgICAgICAgICB0aGlzLnZpZXdzLmRv bS5jb250ZW50RWxlbWVudC5zaWRlQ29udGVudEVsZW1lbnQuaWQgPSAidHJlZU91dGxpbmUiOwor ICAgICAgICAgICAgCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC50 cmVlQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAg ICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnRyZWVDb250ZW50RWxlbWVudC5j bGFzc05hbWUgPSAiY29udGVudCB0cmVlIG91dGxpbmUtZGlzY2xvc3VyZSI7Ci0KKyAgICAgICAg ICAgIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQudHJlZUxpc3RF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKICAgICAgICAgICAgIHRoaXMu ZG9tVHJlZU91dGxpbmUgPSBuZXcgVHJlZU91dGxpbmUodGhpcy52aWV3cy5kb20uY29udGVudEVs ZW1lbnQudHJlZUxpc3RFbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMuZG9tVHJlZU91dGxpbmUu cGFuZWwgPSB0aGlzOwpAQCAtMjQyLDEyICsyNDMsMTcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHBhbmVsID0gdGhpczsKICAgICAg ICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJyZXNpemUiLCBmdW5jdGlvbigpIHsgcGFu ZWwudXBkYXRlVHJlZVNlbGVjdGlvbigpIH0sIGZhbHNlKTsKIAorICAgICAgICAgICAgdGhpcy52 aWV3cy5kb20uY29udGVudEVsZW1lbnQubWFpbkJvdHRvbUNvbnRhaW5lciA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVs ZW1lbnQubWFpbkJvdHRvbUNvbnRhaW5lci5jbGFzc05hbWUgPSAiY3J1bWJzIjsKKyAgICAgICAg ICAgIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuY3J1bWJzRWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAgICAgdGhpcy52 aWV3cy5kb20uY29udGVudEVsZW1lbnQuY3J1bWJzRWxlbWVudC5jbGFzc05hbWUgPSAiY3J1bWJz IjsKIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuaW5uZXJDcnVt YnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgICAgICB0 aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5jcnVtYnNFbGVtZW50LmFwcGVuZENoaWxkKHRo aXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LmlubmVyQ3J1bWJzRWxlbWVudCk7CiAKKyAgICAg ICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50Lm1haW5SZXNpemVXaWRnZXQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICB0aGlzLnZpZXdzLmRv bS5jb250ZW50RWxlbWVudC5tYWluUmVzaXplV2lkZ2V0LmlkID0gIm1haW5SZXNpemVXaWRnZXQi OworICAgICAgICAgICAgCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVu dC5zaWRlYmFyUGFuZXMgPSB7fTsKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRF bGVtZW50LnNpZGViYXJQYW5lcy5zdHlsZXMgPSBuZXcgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5l KCJTdHlsZXMiKTsKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNp ZGViYXJQYW5lcy5tZXRyaWNzID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZSgiTWV0cmlj cyIpOwpAQCAtMjYyLDE4ICsyNjgsMjQgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlUGFuZWwucHJv dG90eXBlID0gewogCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5z aWRlYmFyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICAg ICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZWJhckVsZW1lbnQuY2xhc3NOYW1l ID0gInNpZGViYXIiOworICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQu c2lkZWJhckVsZW1lbnQuaWQgPSAicHJvcGVydGllc1NpZGViYXIiOworICAgICAgICAgICAgCisg ICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5tYWluQm90dG9tQ29udGFp bmVyLmFwcGVuZENoaWxkKHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50Lm1haW5SZXNpemVX aWRnZXQpOworICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQubWFpbkJv dHRvbUNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5j cnVtYnNFbGVtZW50KTsKIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1l bnQuc2lkZWJhckVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy52aWV3cy5kb20uY29udGVudEVsZW1l bnQuc2lkZWJhclBhbmVzLnN0eWxlcy5lbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMudmlld3Mu ZG9tLmNvbnRlbnRFbGVtZW50LnNpZGViYXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudmlld3Mu ZG9tLmNvbnRlbnRFbGVtZW50LnNpZGViYXJQYW5lcy5tZXRyaWNzLmVsZW1lbnQpOwogICAgICAg ICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZWJhckVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZWJhclBhbmVzLnByb3BlcnRp ZXMuZWxlbWVudCk7CiAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50 LnNpZGVDb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxl bWVudC50cmVlQ29udGVudEVsZW1lbnQpOwotICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29u dGVudEVsZW1lbnQuc2lkZUNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudmlld3MuZG9t LmNvbnRlbnRFbGVtZW50LmNydW1ic0VsZW1lbnQpOworICAgICAgICAgICAgdGhpcy52aWV3cy5k b20uY29udGVudEVsZW1lbnQuc2lkZUNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudmll d3MuZG9tLmNvbnRlbnRFbGVtZW50Lm1haW5Cb3R0b21Db250YWluZXIpOwogICAgICAgICAgICAg dGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQudHJlZUNvbnRlbnRFbGVtZW50LmFwcGVuZENo aWxkKHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnRyZWVMaXN0RWxlbWVudCk7CiAKICAg ICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu dmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGVDb250ZW50RWxlbWVudCk7CiAgICAgICAgICAg ICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRv bS5jb250ZW50RWxlbWVudC5zaWRlYmFyRWxlbWVudCk7CiAKKyAgICAgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJtYWluUmVzaXplV2lkZ2V0IikuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgV2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJhZ1N0YXJ0LCB0cnVlKTsKKwogICAg ICAgICAgICAgdGhpcy5yb290RE9NTm9kZSA9IHRoaXMucmVzb3VyY2UuZG9jdW1lbnROb2RlOwog ICAgICAgICB9IGVsc2UgaWYgKHRoaXMucmVzb3VyY2UuY2F0ZWdvcnkgPT09IFdlYkluc3BlY3Rv ci5yZXNvdXJjZUNhdGVnb3JpZXMuaW1hZ2VzKSB7CiAgICAgICAgICAgICB0aGlzLnZpZXdzLnNv dXJjZS5jb250ZW50RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJzb3VyY2UiKTsKQEAgLTE0MDIs MyArMTQxNCwzOCBAQCBXZWJJbnNwZWN0b3IuRE9NUHJvcGVydHlUcmVlRWxlbWVudC5wb3B1CiAg ICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQoaXRlbSk7CiAgICAgfQogfQorCitXZWJJbnNwZWN0 b3IubWFpblJlc2l6ZXJEcmFnU3RhcnQgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBXZWJJbnNw ZWN0b3IuZGl2aWRlckRyYWdTdGFydChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidHJlZU91dGxp bmUiKSwgV2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJhZywgV2ViSW5zcGVjdG9yLm1haW5SZXNp emVyRHJhZ0VuZCwgZXZlbnQsICJjb2wtcmVzaXplIik7Cit9CisKK1dlYkluc3BlY3Rvci5tYWlu UmVzaXplckRyYWdFbmQgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICB2YXIgdHJlZU91dGxpbmUg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidHJlZU91dGxpbmUiKTsKKyAgICB2YXIgcHJvcGVy dGllc1NpZGViYXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicHJvcGVydGllc1NpZGViYXIi KTsKKyAgICB0cmVlT3V0bGluZS5zdHlsZS5yaWdodCA9IHByb3BlcnRpZXNTaWRlYmFyLmNsaWVu dFdpZHRoICsgInB4IjsKKyAgICB0cmVlT3V0bGluZS5zdHlsZS53aWR0aCA9ICJhdXRvIjsKKyAg ICBwcm9wZXJ0aWVzU2lkZWJhci5zdHlsZS5sZWZ0ID0gImF1dG8iOworICAgIFdlYkluc3BlY3Rv ci5kaXZpZGVyRHJhZ0VuZChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidHJlZU91dGxpbmUiKSwg V2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJhZywgV2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJh Z0VuZCwgZXZlbnQpOworfQorCitXZWJJbnNwZWN0b3IubWFpblJlc2l6ZXJEcmFnID0gZnVuY3Rp b24oZXZlbnQpCit7CisgICAgdmFyIHRyZWVPdXRsaW5lID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInRyZWVPdXRsaW5lIik7CisgICAgaWYgKHRyZWVPdXRsaW5lLmRyYWdnaW5nID09IHRydWUp IHsKKyAgICAgICAgdmFyIHByb3BlcnRpZXNTaWRlYmFyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInByb3BlcnRpZXNTaWRlYmFyIik7CisgICAgICAgIHZhciBzaWRlYmFyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInNpZGViYXIiKTsKKyAgICAgICAgCisgICAgICAgIHZhciB4ID0gZXZl bnQuY2xpZW50WCArIHdpbmRvdy5zY3JvbGxYOworICAgICAgICB2YXIgZGVsdGEgPSB0cmVlT3V0 bGluZS5kcmFnTGFzdFggLSB4OworCisgICAgICAgIHRyZWVPdXRsaW5lLmRyYWdMYXN0WCA9IHg7 CisgICAgICAgIG5ld1dpZHRoID0geDsKKyAgICAgICAgCisgICAgICAgIHRyZWVPdXRsaW5lLnN0 eWxlLndpZHRoID0gbmV3V2lkdGggLSBzaWRlYmFyLmNsaWVudFdpZHRoICsgInB4IjsKKyAgICAg ICAgcHJvcGVydGllc1NpZGViYXIuc3R5bGUubGVmdCA9IG5ld1dpZHRoIC0gc2lkZWJhci5jbGll bnRXaWR0aCArICJweCI7CisgICAgICAgIHByb3BlcnRpZXNTaWRlYmFyLnN0eWxlLndpZHRoID0g ZG9jdW1lbnQuYm9keS5jbGllbnRXaWR0aCAtIG5ld1dpZHRoICsgInB4IjsKKyAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKKyAgICB9Cit9CkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL2luc3BlY3Rvci5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuY3NzCShyZXZpc2lvbiAyNDk3NykKKysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv aW5zcGVjdG9yLmNzcwkod29ya2luZyBjb3B5KQpAQCAtNzY5LDYgKzc2OSwxNSBAQCBib2R5Lmlu YWN0aXZlICNzaWRlYmFyIGxpLnNlbGVjdGVkIHsKICAgICBjb2xvcjogcmdiKDIwLCAyMCwgMjAp OwogfQogCisjbWFpblJlc2l6ZVdpZGdldCB7CisgICAgZGlzcGxheTogYmxvY2s7CisgICAgZmxv YXQ6IHJpZ2h0OworICAgIHdpZHRoOiAxN3B4OworICAgIGhlaWdodDogMjBweDsKKyAgICBiYWNr Z3JvdW5kOiB1cmwoSW1hZ2VzL3NpZGViYXJSZXNpemVXaWRnZXQucG5nKSByaWdodCBuby1yZXBl YXQ7CisgICAgY3Vyc29yOiBjb2wtcmVzaXplOworfQorCiAuY3J1bWJzID4gZGl2IHsKICAgICBw b3NpdGlvbjogYWJzb2x1dGU7CiB9Cg== 15899 2007-08-10 06:06:24 -0700 2007-08-10 11:04:59 -0700 Resizing of styles sidebar v2 patch text/plain 7361 sjoerd SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDk4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDctMDgtMTAgIFNqb2VyZCBUaWVsZW1hbiAgPHNldCBFTUFJTF9B RERSRVNTIGVudmlyb25tZW50IHZhcmlhYmxlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAxNDI2NTogQ2Fubm90IHJlc2l6ZSBjb2x1bW5zIGlu IHdlYmluc3BlY3RvcgorICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDI2NQorCisgICAgICAgIEVuYWJsZSBzdHlsZXMgc2lkZWJhciB0byBiZSByZXNpemFi bGUgaW4gaW5zcGVjdG9yLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VQYW5l bC5qczoKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzOgorCiAyMDA3LTA4 LTEwICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBNYWMg YnVpbGQuCkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlUGFuZWwuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNvdXJjZVBhbmVsLmpzCShyZXZp c2lvbiAyNDk4NCkKKysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VQYW5lbC5qcwko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcg QXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNyBT am9lcmQgVGllbGVtYW4gKFNqb2VyZC5UaWVsZW1hbkBwaGlsLnV1Lm5sKS4KICAqCiAgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjMxLDEwICsyMzIsMTEgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5j b250ZW50RWxlbWVudC5zaWRlQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGVD b250ZW50RWxlbWVudC5jbGFzc05hbWUgPSAiY29udGVudCBzaWRlIjsKLQorICAgICAgICAgICAg dGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZUNvbnRlbnRFbGVtZW50LmlkID0gInRy ZWVPdXRsaW5lIjsKKyAgICAgICAgICAgIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29u dGVudEVsZW1lbnQudHJlZUNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7CiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC50cmVlQ29u dGVudEVsZW1lbnQuY2xhc3NOYW1lID0gImNvbnRlbnQgdHJlZSBvdXRsaW5lLWRpc2Nsb3N1cmUi OwotCisgICAgICAgICAgICAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVt ZW50LnRyZWVMaXN0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAg ICAgICAgICB0aGlzLmRvbVRyZWVPdXRsaW5lID0gbmV3IFRyZWVPdXRsaW5lKHRoaXMudmlld3Mu ZG9tLmNvbnRlbnRFbGVtZW50LnRyZWVMaXN0RWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLmRv bVRyZWVPdXRsaW5lLnBhbmVsID0gdGhpczsKQEAgLTI0MiwxMiArMjQ0LDE3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBwYW5lbCA9 IHRoaXM7CiAgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigicmVzaXplIiwgZnVu Y3Rpb24oKSB7IHBhbmVsLnVwZGF0ZVRyZWVTZWxlY3Rpb24oKSB9LCBmYWxzZSk7CiAKKyAgICAg ICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50Lm1haW5Cb3R0b21Db250YWluZXIg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgIHRoaXMudmlld3Mu ZG9tLmNvbnRlbnRFbGVtZW50Lm1haW5Cb3R0b21Db250YWluZXIuY2xhc3NOYW1lID0gImNydW1i cyI7CisgICAgICAgICAgICAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVt ZW50LmNydW1ic0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAg ICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LmNydW1ic0VsZW1lbnQuY2xhc3NO YW1lID0gImNydW1icyI7CiAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVt ZW50LmlubmVyQ3J1bWJzRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwog ICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuY3J1bWJzRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5pbm5lckNydW1ic0VsZW1l bnQpOwogCisgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5tYWluUmVz aXplV2lkZ2V0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgICAgICAgICAg dGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQubWFpblJlc2l6ZVdpZGdldC5pZCA9ICJtYWlu UmVzaXplV2lkZ2V0IjsKKyAgICAgICAgICAgIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20u Y29udGVudEVsZW1lbnQuc2lkZWJhclBhbmVzID0ge307CiAgICAgICAgICAgICB0aGlzLnZpZXdz LmRvbS5jb250ZW50RWxlbWVudC5zaWRlYmFyUGFuZXMuc3R5bGVzID0gbmV3IFdlYkluc3BlY3Rv ci5TaWRlYmFyUGFuZSgiU3R5bGVzIik7CiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250 ZW50RWxlbWVudC5zaWRlYmFyUGFuZXMubWV0cmljcyA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJh clBhbmUoIk1ldHJpY3MiKTsKQEAgLTI2MiwxOCArMjY5LDI0IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZVBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29u dGVudEVsZW1lbnQuc2lkZWJhckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGViYXJFbGVt ZW50LmNsYXNzTmFtZSA9ICJzaWRlYmFyIjsKKyAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNv bnRlbnRFbGVtZW50LnNpZGViYXJFbGVtZW50LmlkID0gInByb3BlcnRpZXNTaWRlYmFyIjsKKyAg ICAgICAgICAgIAorICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQubWFp bkJvdHRvbUNvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVu dC5tYWluUmVzaXplV2lkZ2V0KTsKKyAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRF bGVtZW50Lm1haW5Cb3R0b21Db250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy52aWV3cy5kb20uY29u dGVudEVsZW1lbnQuY3J1bWJzRWxlbWVudCk7CiAKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9t LmNvbnRlbnRFbGVtZW50LnNpZGViYXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudmlld3MuZG9t LmNvbnRlbnRFbGVtZW50LnNpZGViYXJQYW5lcy5zdHlsZXMuZWxlbWVudCk7CiAgICAgICAgICAg ICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5zaWRlYmFyUGFuZXMubWV0cmljcy5lbGVt ZW50KTsKICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGViYXJF bGVtZW50LmFwcGVuZENoaWxkKHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGViYXJQ YW5lcy5wcm9wZXJ0aWVzLmVsZW1lbnQpOwogCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5j b250ZW50RWxlbWVudC5zaWRlQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy52aWV3cy5k b20uY29udGVudEVsZW1lbnQudHJlZUNvbnRlbnRFbGVtZW50KTsKLSAgICAgICAgICAgIHRoaXMu dmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGVDb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5jcnVtYnNFbGVtZW50KTsKKyAgICAgICAgICAg IHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnNpZGVDb250ZW50RWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5tYWluQm90dG9tQ29udGFpbmVyKTsK ICAgICAgICAgICAgIHRoaXMudmlld3MuZG9tLmNvbnRlbnRFbGVtZW50LnRyZWVDb250ZW50RWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC50cmVlTGlzdEVs ZW1lbnQpOwogCiAgICAgICAgICAgICB0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLnZpZXdzLmRvbS5jb250ZW50RWxlbWVudC5zaWRlQ29udGVudEVsZW1lbnQp OwogICAgICAgICAgICAgdGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy52aWV3cy5kb20uY29udGVudEVsZW1lbnQuc2lkZWJhckVsZW1lbnQpOwogCisgICAgICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWFpblJlc2l6ZVdpZGdldCIpLmFkZEV2ZW50 TGlzdGVuZXIoIm1vdXNlZG93biIsIFdlYkluc3BlY3Rvci5tYWluUmVzaXplckRyYWdTdGFydCwg dHJ1ZSk7CisKICAgICAgICAgICAgIHRoaXMucm9vdERPTU5vZGUgPSB0aGlzLnJlc291cmNlLmRv Y3VtZW50Tm9kZTsKICAgICAgICAgfSBlbHNlIGlmICh0aGlzLnJlc291cmNlLmNhdGVnb3J5ID09 PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLmltYWdlcykgewogICAgICAgICAgICAg dGhpcy52aWV3cy5zb3VyY2UuY29udGVudEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic291cmNl Iik7CkBAIC0xNDAyLDMgKzE0MTUsMzggQEAgV2ViSW5zcGVjdG9yLkRPTVByb3BlcnR5VHJlZUVs ZW1lbnQucG9wdQogICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKGl0ZW0pOwogICAgIH0KIH0K KworV2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJhZ1N0YXJ0ID0gZnVuY3Rpb24oZXZlbnQpCit7 CisgICAgV2ViSW5zcGVjdG9yLmRpdmlkZXJEcmFnU3RhcnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInRyZWVPdXRsaW5lIiksIFdlYkluc3BlY3Rvci5tYWluUmVzaXplckRyYWcsIFdlYkluc3Bl Y3Rvci5tYWluUmVzaXplckRyYWdFbmQsIGV2ZW50LCAiY29sLXJlc2l6ZSIpOworfQorCitXZWJJ bnNwZWN0b3IubWFpblJlc2l6ZXJEcmFnRW5kID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAgdmFy IHRyZWVPdXRsaW5lID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRyZWVPdXRsaW5lIik7Cisg ICAgdmFyIHByb3BlcnRpZXNTaWRlYmFyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInByb3Bl cnRpZXNTaWRlYmFyIik7CisgICAgdHJlZU91dGxpbmUuc3R5bGUucmlnaHQgPSBwcm9wZXJ0aWVz U2lkZWJhci5vZmZzZXRXaWR0aCArICJweCI7CisgICAgdHJlZU91dGxpbmUuc3R5bGUud2lkdGgg PSAiYXV0byI7CisgICAgcHJvcGVydGllc1NpZGViYXIuc3R5bGUubGVmdCA9ICJhdXRvIjsKKyAg ICBXZWJJbnNwZWN0b3IuZGl2aWRlckRyYWdFbmQodHJlZU91dGxpbmUsIFdlYkluc3BlY3Rvci5t YWluUmVzaXplckRyYWcsIFdlYkluc3BlY3Rvci5tYWluUmVzaXplckRyYWdFbmQsIGV2ZW50KTsK K30KKworV2ViSW5zcGVjdG9yLm1haW5SZXNpemVyRHJhZyA9IGZ1bmN0aW9uKGV2ZW50KQorewor ICAgIHZhciB0cmVlT3V0bGluZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0cmVlT3V0bGlu ZSIpOworICAgIGlmICh0cmVlT3V0bGluZS5kcmFnZ2luZyA9PSB0cnVlKSB7CisgICAgICAgIHZh ciBwcm9wZXJ0aWVzU2lkZWJhciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwcm9wZXJ0aWVz U2lkZWJhciIpOworICAgICAgICB2YXIgc2lkZWJhciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJzaWRlYmFyIik7CisgICAgICAgIAorICAgICAgICB2YXIgeCA9IGV2ZW50LmNsaWVudFggKyB3 aW5kb3cuc2Nyb2xsWDsKKyAgICAgICAgdmFyIGRlbHRhID0gdHJlZU91dGxpbmUuZHJhZ0xhc3RY IC0geDsKKworICAgICAgICB0cmVlT3V0bGluZS5kcmFnTGFzdFggPSB4OworICAgICAgICBuZXdX aWR0aCA9IHg7CisgICAgICAgIAorICAgICAgICB0cmVlT3V0bGluZS5zdHlsZS53aWR0aCA9IG5l d1dpZHRoIC0gc2lkZWJhci5jbGllbnRXaWR0aCArICJweCI7CisgICAgICAgIHByb3BlcnRpZXNT aWRlYmFyLnN0eWxlLmxlZnQgPSBuZXdXaWR0aCAtIHNpZGViYXIuY2xpZW50V2lkdGggKyAicHgi OworICAgICAgICBwcm9wZXJ0aWVzU2lkZWJhci5zdHlsZS53aWR0aCA9IGRvY3VtZW50LmJvZHku Y2xpZW50V2lkdGggLSBuZXdXaWR0aCArICJweCI7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZh dWx0KCk7CisgICAgfQorfQpJbmRleDogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3Iu Y3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwko cmV2aXNpb24gMjQ5ODQpCisrKyBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MJ KHdvcmtpbmcgY29weSkKQEAgLTc2OSw2ICs3NjksMTUgQEAgYm9keS5pbmFjdGl2ZSAjc2lkZWJh ciBsaS5zZWxlY3RlZCB7CiAgICAgY29sb3I6IHJnYigyMCwgMjAsIDIwKTsKIH0KIAorI21haW5S ZXNpemVXaWRnZXQgeworICAgIGRpc3BsYXk6IGJsb2NrOworICAgIGZsb2F0OiByaWdodDsKKyAg ICB3aWR0aDogMTdweDsKKyAgICBoZWlnaHQ6IDIwcHg7CisgICAgYmFja2dyb3VuZDogdXJsKElt YWdlcy9zaWRlYmFyUmVzaXplV2lkZ2V0LnBuZykgcmlnaHQgbm8tcmVwZWF0OworICAgIGN1cnNv cjogY29sLXJlc2l6ZTsKK30KKwogLmNydW1icyA+IGRpdiB7CiAgICAgcG9zaXRpb246IGFic29s dXRlOwogfQo=