Functions

+ //Inheritance example: + (function (jQuery, richfaces, params) { + = + // Constructor definition + richfaces.MyComponent =3D function(componentId) { + $super.constructor.call(this, componentId); + }; + = + // Extend component class + var $super =3D richfaces.BaseComponent.extend(richfaces.BaseComponent, = richfaces.MyComponent); + = + // Add new properties and methods + jQuery.extend(richfaces.MyComponent.prototype, (function (params) { + return { + name:"MyComponent", = + f:function (){alert("hello"); + } + }; + })(params)); + })(jQuery, RichFaces); +

') + .css({ + width: this.offsetWidth+"px", height: this.offsetHeight+"px", + position: "absolute", opacity: "0.001", zIndex: 1000 + }) + .css($(this).offset()) + .appendTo("body"); + }); + }, + stop: function(event, ui) { + $("div.ui-draggable-iframeFix").each(function() { this.parentNode.remove= Child(this); }); //Remove frame helpers + } +}); + +$.ui.plugin.add("draggable", "opacity", { + start: function(event, ui) { + var t =3D $(ui.helper), o =3D $(this).data('draggable').options; + if(t.css("opacity")) o._opacity =3D t.css("opacity"); + t.css('opacity', o.opacity); + }, + stop: function(event, ui) { + var o =3D $(this).data('draggable').options; + if(o._opacity) $(ui.helper).css('opacity', o._opacity); + } +}); + +$.ui.plugin.add("draggable", "scroll", { + start: function(event, ui) { + var i =3D $(this).data("draggable"); + if(i.scrollParent[0] !=3D document && i.scrollParent[0].tagName !=3D 'HT= ML') i.overflowOffset =3D i.scrollParent.offset(); + }, + drag: function(event, ui) { + + var i =3D $(this).data("draggable"), o =3D i.options, scrolled =3D false; + + if(i.scrollParent[0] !=3D document && i.scrollParent[0].tagName !=3D 'HT= ML') { + + if(!o.axis || o.axis !=3D 'x') { + if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pag= eY < o.scrollSensitivity) + i.scrollParent[0].scrollTop =3D scrolled =3D i.scrollParent[0].scroll= Top + o.scrollSpeed; + else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) + i.scrollParent[0].scrollTop =3D scrolled =3D i.scrollParent[0].scroll= Top - o.scrollSpeed; + } + + if(!o.axis || o.axis !=3D 'y') { + if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pag= eX < o.scrollSensitivity) + i.scrollParent[0].scrollLeft =3D scrolled =3D i.scrollParent[0].scrol= lLeft + o.scrollSpeed; + else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) + i.scrollParent[0].scrollLeft =3D scrolled =3D i.scrollParent[0].scrol= lLeft - o.scrollSpeed; + } + + } else { + + if(!o.axis || o.axis !=3D 'x') { + if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) + scrolled =3D $(document).scrollTop($(document).scrollTop() - o.scroll= Speed); + else if($(window).height() - (event.pageY - $(document).scrollTop()) <= o.scrollSensitivity) + scrolled =3D $(document).scrollTop($(document).scrollTop() + o.scroll= Speed); + } + + if(!o.axis || o.axis !=3D 'y') { + if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) + scrolled =3D $(document).scrollLeft($(document).scrollLeft() - o.scro= llSpeed); + else if($(window).width() - (event.pageX - $(document).scrollLeft()) <= o.scrollSensitivity) + scrolled =3D $(document).scrollLeft($(document).scrollLeft() + o.scro= llSpeed); + } + + } + + if(scrolled !=3D=3D false && $.ui.ddmanager && !o.dropBehaviour) + $.ui.ddmanager.prepareOffsets(i, event); + + } +}); + +$.ui.plugin.add("draggable", "snap", { + start: function(event, ui) { + + var i =3D $(this).data("draggable"), o =3D i.options; + i.snapElements =3D []; + + $(o.snap.constructor !=3D String ? ( o.snap.items || ':data(draggable)' = ) : o.snap).each(function() { + var $t =3D $(this); var $o =3D $t.offset(); + if(this !=3D i.element[0]) i.snapElements.push({ + item: this, + width: $t.outerWidth(), height: $t.outerHeight(), + top: $o.top, left: $o.left + }); + }); + + }, + drag: function(event, ui) { + + var inst =3D $(this).data("draggable"), o =3D inst.options; + var d =3D o.snapTolerance; + + var x1 =3D ui.offset.left, x2 =3D x1 + inst.helperProportions.width, + y1 =3D ui.offset.top, y2 =3D y1 + inst.helperProportions.height; + + for (var i =3D inst.snapElements.length - 1; i >=3D 0; i--){ + + var l =3D inst.snapElements[i].left, r =3D l + inst.snapElements[i].wid= th, + t =3D inst.snapElements[i].top, b =3D t + inst.snapElements[i].height; + + //Yes, I know, this is insane ;) + if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 = < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 <= b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) { + if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.o= ptions.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { sn= apItem: inst.snapElements[i].item }))); + inst.snapElements[i].snapping =3D false; + continue; + } + + if(o.snapMode !=3D 'inner') { + var ts =3D Math.abs(t - y2) <=3D d; + var bs =3D Math.abs(b - y1) <=3D d; + var ls =3D Math.abs(l - x2) <=3D d; + var rs =3D Math.abs(r - x1) <=3D d; + if(ts) ui.position.top =3D inst._convertPositionTo("relative", { top: = t - inst.helperProportions.height, left: 0 }).top - inst.margins.top; + if(bs) ui.position.top =3D inst._convertPositionTo("relative", { top: = b, left: 0 }).top - inst.margins.top; + if(ls) ui.position.left =3D inst._convertPositionTo("relative", { top:= 0, left: l - inst.helperProportions.width }).left - inst.margins.left; + if(rs) ui.position.left =3D inst._convertPositionTo("relative", { top:= 0, left: r }).left - inst.margins.left; + } + + var first =3D (ts || bs || ls || rs); + + if(o.snapMode !=3D 'outer') { + var ts =3D Math.abs(t - y1) <=3D d; + var bs =3D Math.abs(b - y2) <=3D d; + var ls =3D Math.abs(l - x1) <=3D d; + var rs =3D Math.abs(r - x2) <=3D d; + if(ts) ui.position.top =3D inst._convertPositionTo("relative", { top: = t, left: 0 }).top - inst.margins.top; + if(bs) ui.position.top =3D inst._convertPositionTo("relative", { top: = b - inst.helperProportions.height, left: 0 }).top - inst.margins.top; + if(ls) ui.position.left =3D inst._convertPositionTo("relative", { top:= 0, left: l }).left - inst.margins.left; + if(rs) ui.position.left =3D inst._convertPositionTo("relative", { top:= 0, left: r - inst.helperProportions.width }).left - inst.margins.left; + } + + if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) + (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, e= vent, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item }))); + inst.snapElements[i].snapping =3D (ts || bs || ls || rs || first); + + }; + + } +}); + +$.ui.plugin.add("draggable", "stack", { + start: function(event, ui) { + + var o =3D $(this).data("draggable").options; + + var group =3D $.makeArray($(o.stack.group)).sort(function(a,b) { + return (parseInt($(a).css("zIndex"),10) || o.stack.min) - (parseInt($(b= ).css("zIndex"),10) || o.stack.min); + }); + + $(group).each(function(i) { + this.style.zIndex =3D o.stack.min + i; + }); + + this[0].style.zIndex =3D o.stack.min + group.length; + + } +}); + +$.ui.plugin.add("draggable", "zIndex", { + start: function(event, ui) { + var t =3D $(ui.helper), o =3D $(this).data("draggable").options; + if(t.css("zIndex")) o._zIndex =3D t.css("zIndex"); + t.css('zIndex', o.zIndex); + }, + stop: function(event, ui) { + var o =3D $(this).data("draggable").options; + if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex); + } +}); + +})(jQuery); Added: branches/community/3.3.X/sandbox/samples/full-calendar/src/main/weba= pp/ui.resizable.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/community/3.3.X/sandbox/samples/full-calendar/src/main/webapp/= ui.resizable.js (rev 0) +++ branches/community/3.3.X/sandbox/samples/full-calendar/src/main/webapp/= ui.resizable.js 2010-04-29 01:40:35 UTC (rev 16835) @@ -0,0 +1,800 @@ +/* + * jQuery UI Resizable 1.7.2 + * + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Resizables + * + * Depends: + * ui.core.js + */ +(function($) { + +$.widget("ui.resizable", $.extend({}, $.ui.mouse, { + + _init: function() { + + var self =3D this, o =3D this.options; + this.element.addClass("ui-resizable"); + + $.extend(this, { + _aspectRatio: !!(o.aspectRatio), + aspectRatio: o.aspectRatio, + originalElement: this.element, + _proportionallyResizeElements: [], + _helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-h= elper' : null + }); + + //Wrap the element if it cannot hold child nodes + if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|i= mg/i)) { + + //Opera fix for relative positioning + if (/relative/.test(this.element.css('position')) && $.browser.opera) + this.element.css({ position: 'relative', top: 'auto', left: 'auto' }); + + //Create a wrapper element and set the wrapper to the new current inter= nal element + this.element.wrap( + $('

').css({ + position: this.element.css('position'), + width: this.element.outerWidth(), + height: this.element.outerHeight(), + top: this.element.css('top'), + left: this.element.css('left') + }) + ); + + //Overwrite the original this.element + this.element =3D this.element.parent().data( + "resizable", this.element.data('resizable') + ); + + this.elementIsWrapper =3D true; + + //Move margins to the wrapper + this.element.css({ marginLeft: this.originalElement.css("marginLeft"), = marginTop: this.originalElement.css("marginTop"), marginRight: this.origina= lElement.css("marginRight"), marginBottom: this.originalElement.css("margin= Bottom") }); + this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0,= marginBottom: 0}); + + //Prevent Safari textarea resize + this.originalResizeStyle =3D this.originalElement.css('resize'); + this.originalElement.css('resize', 'none'); + + //Push the actual element to our proportionallyResize internal array + this._proportionallyResizeElements.push(this.originalElement.css({ posi= tion: 'static', zoom: 1, display: 'block' })); + + // avoid IE jump (hard set the margin) + this.originalElement.css({ margin: this.originalElement.css('margin') }= ); + + // fix handlers offset + this._proportionallyResize(); + + } + + this.handles =3D o.handles || (!$('.ui-resizable-handle', this.element).= length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-r= esizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizab= le-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' }); + if(this.handles.constructor =3D=3D String) { + + if(this.handles =3D=3D 'all') this.handles =3D 'n,e,s,w,se,sw,ne,nw'; + var n =3D this.handles.split(","); this.handles =3D {}; + + for(var i =3D 0; i < n.length; i++) { + + var handle =3D $.trim(n[i]), hname =3D 'ui-resizable-'+handle; + var axis =3D $('

'); + + // increase zIndex of sw, se, ne, nw axis + //TODO : this modifies original option + if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex }); + + //TODO : What's going on here? + if ('se' =3D=3D handle) { + axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se'); + }; + + //Insert into internal handles object and append to element + this.handles[handle] =3D '.ui-resizable-'+handle; + this.element.append(axis); + } + + } + + this._renderAxis =3D function(target) { + + target =3D target || this.element; + + for(var i in this.handles) { + + if(this.handles[i].constructor =3D=3D String) + this.handles[i] =3D $(this.handles[i], this.element).show(); + + //Apply pad to wrapper element, needed to fix axis position (textarea,= inputs, scrolls) + if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/t= extarea|input|select|button/i)) { + + var axis =3D $(this.handles[i], this.element), padWrapper =3D 0; + + //Checking the correct pad and border + padWrapper =3D /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.= outerWidth(); + + //The padding type i have to apply... + var padPos =3D [ 'padding', + /ne|nw|n/.test(i) ? 'Top' : + /se|sw|s/.test(i) ? 'Bottom' : + /^e$/.test(i) ? 'Right' : 'Left' ].join(""); + + target.css(padPos, padWrapper); + + this._proportionallyResize(); + + } + + //TODO: What's that good for? There's not anything to be executed left + if(!$(this.handles[i]).length) + continue; + + } + }; + + //TODO: make renderAxis a prototype function + this._renderAxis(this.element); + + this._handles =3D $('.ui-resizable-handle', this.element) + .disableSelection(); + + //Matching axis name + this._handles.mouseover(function() { + if (!self.resizing) { + if (this.className) + var axis =3D this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)= /i); + //Axis, default =3D se + self.axis =3D axis && axis[1] ? axis[1] : 'se'; + } + }); + + //If we want to auto hide the elements + if (o.autoHide) { + this._handles.hide(); + $(this.element) + .addClass("ui-resizable-autohide") + .hover(function() { + $(this).removeClass("ui-resizable-autohide"); + self._handles.show(); + }, + function(){ + if (!self.resizing) { + $(this).addClass("ui-resizable-autohide"); + self._handles.hide(); + } + }); + } + + //Initialize the mouse interaction + this._mouseInit(); + + }, + + destroy: function() { + + this._mouseDestroy(); + + var _destroy =3D function(exp) { + $(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-res= izing") + .removeData("resizable").unbind(".resizable").find('.ui-resizable-hand= le').remove(); + }; + + //TODO: Unwrap at same DOM position + if (this.elementIsWrapper) { + _destroy(this.element); + var wrapper =3D this.element; + wrapper.parent().append( + this.originalElement.css({ + position: wrapper.css('position'), + width: wrapper.outerWidth(), + height: wrapper.outerHeight(), + top: wrapper.css('top'), + left: wrapper.css('left') + }) + ).end().remove(); + } + + this.originalElement.css('resize', this.originalResizeStyle); + _destroy(this.originalElement); + + }, + + _mouseCapture: function(event) { + + var handle =3D false; + for(var i in this.handles) { + if($(this.handles[i])[0] =3D=3D event.target) handle =3D true; + } + + return this.options.disabled || !!handle; + + }, + + _mouseStart: function(event) { + + var o =3D this.options, iniPos =3D this.element.position(), el =3D this.= element; + + this.resizing =3D true; + this.documentScroll =3D { top: $(document).scrollTop(), left: $(document= ).scrollLeft() }; + + // bugfix for http://dev.jquery.com/ticket/1749 + if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) { + el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left }); + } + + //Opera fixing relative position + if ($.browser.opera && (/relative/).test(el.css('position'))) + el.css({ position: 'relative', top: 'auto', left: 'auto' }); + + this._renderProxy(); + + var curleft =3D num(this.helper.css('left')), curtop =3D num(this.helper= .css('top')); + + if (o.containment) { + curleft +=3D $(o.containment).scrollLeft() || 0; + curtop +=3D $(o.containment).scrollTop() || 0; + } + + //Store needed variables + this.offset =3D this.helper.offset(); + this.position =3D { left: curleft, top: curtop }; + this.size =3D this._helper ? { width: el.outerWidth(), height: el.outerH= eight() } : { width: el.width(), height: el.height() }; + this.originalSize =3D this._helper ? { width: el.outerWidth(), height: e= l.outerHeight() } : { width: el.width(), height: el.height() }; + this.originalPosition =3D { left: curleft, top: curtop }; + this.sizeDiff =3D { width: el.outerWidth() - el.width(), height: el.oute= rHeight() - el.height() }; + this.originalMousePosition =3D { left: event.pageX, top: event.pageY }; + + //Aspect Ratio + this.aspectRatio =3D (typeof o.aspectRatio =3D=3D 'number') ? o.aspectRa= tio : ((this.originalSize.width / this.originalSize.height) || 1); + + var cursor =3D $('.ui-resizable-' + this.axis).css('cursor'); + $('body').css('cursor', cursor =3D=3D 'auto' ? this.axis + '-resize' = : cursor); + + el.addClass("ui-resizable-resizing"); + this._propagate("start", event); + return true; + }, + + _mouseDrag: function(event) { + + //Increase performance, avoid regex + var el =3D this.helper, o =3D this.options, props =3D {}, + self =3D this, smp =3D this.originalMousePosition, a =3D this.axis; + + var dx =3D (event.pageX-smp.left)||0, dy =3D (event.pageY-smp.top)||0; + var trigger =3D this._change[a]; + if (!trigger) return false; + + // Calculate the attrs that will be change + var data =3D trigger.apply(this, [event, dx, dy]), ie6 =3D $.browser.msi= e && $.browser.version < 7, csdif =3D this.sizeDiff; + + if (this._aspectRatio || event.shiftKey) + data =3D this._updateRatio(data, event); + + data =3D this._respectSize(data, event); + + // plugins callbacks need to be called first + this._propagate("resize", event); + + el.css({ + top: this.position.top + "px", left: this.position.left + "px", + width: this.size.width + "px", height: this.size.height + "px" + }); + + if (!this._helper && this._proportionallyResizeElements.length) + this._proportionallyResize(); + + this._updateCache(data); + + // calling the user callback at the end + this._trigger('resize', event, this.ui()); + + return false; + }, + + _mouseStop: function(event) { + + this.resizing =3D false; + var o =3D this.options, self =3D this; + + if(this._helper) { + var pr =3D this._proportionallyResizeElements, ista =3D pr.length && (/= textarea/i).test(pr[0].nodeName), + soffseth =3D ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump he= ight */ ? 0 : self.sizeDiff.height, + soffsetw =3D ista ? 0 : self.sizeDiff.width; + + var s =3D { width: (self.size.width - soffsetw), height: (self.size.hei= ght - soffseth) }, + left =3D (parseInt(self.element.css('left'), 10) + (self.position.left= - self.originalPosition.left)) || null, + top =3D (parseInt(self.element.css('top'), 10) + (self.position.top - = self.originalPosition.top)) || null; + + if (!o.animate) + this.element.css($.extend(s, { top: top, left: left })); + + self.helper.height(self.size.height); + self.helper.width(self.size.width); + + if (this._helper && !o.animate) this._proportionallyResize(); + } + + $('body').css('cursor', 'auto'); + + this.element.removeClass("ui-resizable-resizing"); + + this._propagate("stop", event); + + if (this._helper) this.helper.remove(); + return false; + + }, + + _updateCache: function(data) { + var o =3D this.options; + this.offset =3D this.helper.offset(); + if (isNumber(data.left)) this.position.left =3D data.left; + if (isNumber(data.top)) this.position.top =3D data.top; + if (isNumber(data.height)) this.size.height =3D data.height; + if (isNumber(data.width)) this.size.width =3D data.width; + }, + + _updateRatio: function(data, event) { + + var o =3D this.options, cpos =3D this.position, csize =3D this.size, a = =3D this.axis; + + if (data.height) data.width =3D (csize.height * this.aspectRatio); + else if (data.width) data.height =3D (csize.width / this.aspectRatio); + + if (a =3D=3D 'sw') { + data.left =3D cpos.left + (csize.width - data.width); + data.top =3D null; + } + if (a =3D=3D 'nw') { + data.top =3D cpos.top + (csize.height - data.height); + data.left =3D cpos.left + (csize.width - data.width); + } + + return data; + }, + + _respectSize: function(data, event) { + + var el =3D this.helper, o =3D this.options, pRatio =3D this._aspectRatio= || event.shiftKey, a =3D this.axis, + ismaxw =3D isNumber(data.width) && o.maxWidth && (o.maxWidth < data.wi= dth), ismaxh =3D isNumber(data.height) && o.maxHeight && (o.maxHeight < dat= a.height), + isminw =3D isNumber(data.width) && o.minWidth && (o.minWidth > data.w= idth), isminh =3D isNumber(data.height) && o.minHeight && (o.minHeight > da= ta.height); + + if (isminw) data.width =3D o.minWidth; + if (isminh) data.height =3D o.minHeight; + if (ismaxw) data.width =3D o.maxWidth; + if (ismaxh) data.height =3D o.maxHeight; + + var dw =3D this.originalPosition.left + this.originalSize.width, dh =3D = this.position.top + this.size.height; + var cw =3D /sw|nw|w/.test(a), ch =3D /nw|ne|n/.test(a); + + if (isminw && cw) data.left =3D dw - o.minWidth; + if (ismaxw && cw) data.left =3D dw - o.maxWidth; + if (isminh && ch) data.top =3D dh - o.minHeight; + if (ismaxh && ch) data.top =3D dh - o.maxHeight; + + // fixing jump error on top/left - bug #2330 + var isNotwh =3D !data.width && !data.height; + if (isNotwh && !data.left && data.top) data.top =3D null; + else if (isNotwh && !data.top && data.left) data.left =3D null; + + return data; + }, + + _proportionallyResize: function() { + + var o =3D this.options; + if (!this._proportionallyResizeElements.length) return; + var element =3D this.helper || this.element; + + for (var i=3D0; i < this._proportionallyResizeElements.length; i++) { + + var prel =3D this._proportionallyResizeElements[i]; + + if (!this.borderDif) { + var b =3D [prel.css('borderTopWidth'), prel.css('borderRightWidth'), p= rel.css('borderBottomWidth'), prel.css('borderLeftWidth')], + p =3D [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('pa= ddingBottom'), prel.css('paddingLeft')]; + + this.borderDif =3D $.map(b, function(v, i) { + var border =3D parseInt(v,10)||0, padding =3D parseInt(p[i],10)||0; + return border + padding; + }); + } + + if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parent= s(':hidden').length))) + continue; + + prel.css({ + height: (element.height() - this.borderDif[0] - this.borderDif[2]) || = 0, + width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0 + }); + + }; + + }, + + _renderProxy: function() { + + var el =3D this.element, o =3D this.options; + this.elementOffset =3D el.offset(); + + if(this._helper) { + + this.helper =3D this.helper || $('

'); + + // fix ie6 offset TODO: This seems broken + var ie6 =3D $.browser.msie && $.browser.version < 7, ie6offset =3D (ie6= ? 1 : 0), + pxyoffset =3D ( ie6 ? 2 : -1 ); + + this.helper.addClass(this._helper).css({ + width: this.element.outerWidth() + pxyoffset, + height: this.element.outerHeight() + pxyoffset, + position: 'absolute', + left: this.elementOffset.left - ie6offset +'px', + top: this.elementOffset.top - ie6offset +'px', + zIndex: ++o.zIndex //TODO: Don't modify option + }); + + this.helper + .appendTo("body") + .disableSelection(); + + } else { + this.helper =3D this.element; + } + + }, + + _change: { + e: function(event, dx, dy) { + return { width: this.originalSize.width + dx }; + }, + w: function(event, dx, dy) { + var o =3D this.options, cs =3D this.originalSize, sp =3D this.originalP= osition; + return { left: sp.left + dx, width: cs.width - dx }; + }, + n: function(event, dx, dy) { + var o =3D this.options, cs =3D this.originalSize, sp =3D this.originalP= osition; + return { top: sp.top + dy, height: cs.height - dy }; + }, + s: function(event, dx, dy) { + return { height: this.originalSize.height + dy }; + }, + se: function(event, dx, dy) { + return $.extend(this._change.s.apply(this, arguments), this._change.e.a= pply(this, [event, dx, dy])); + }, + sw: function(event, dx, dy) { + return $.extend(this._change.s.apply(this, arguments), this._change.w.a= pply(this, [event, dx, dy])); + }, + ne: function(event, dx, dy) { + return $.extend(this._change.n.apply(this, arguments), this._change.e.a= pply(this, [event, dx, dy])); + }, + nw: function(event, dx, dy) { + return $.extend(this._change.n.apply(this, arguments), this._change.w.a= pply(this, [event, dx, dy])); + } + }, + + _propagate: function(n, event) { + $.ui.plugin.call(this, n, [event, this.ui()]); + (n !=3D "resize" && this._trigger(n, event, this.ui())); + }, + + plugins: {}, + + ui: function() { + return { + originalElement: this.originalElement, + element: this.element, + helper: this.helper, + position: this.position, + size: this.size, + originalSize: this.originalSize, + originalPosition: this.originalPosition + }; + } + +})); + +$.extend($.ui.resizable, { + version: "1.7.2", + eventPrefix: "resize", + defaults: { + alsoResize: false, + animate: false, + animateDuration: "slow", + animateEasing: "swing", + aspectRatio: false, + autoHide: false, + cancel: ":input,option", + containment: false, + delay: 0, + distance: 1, + ghost: false, + grid: false, + handles: "e,s,se", + helper: false, + maxHeight: null, + maxWidth: null, + minHeight: 10, + minWidth: 10, + zIndex: 1000 + } +}); + +/* + * Resizable Extensions + */ + +$.ui.plugin.add("resizable", "alsoResize", { + + start: function(event, ui) { + + var self =3D $(this).data("resizable"), o =3D self.options; + + _store =3D function(exp) { + $(exp).each(function() { + $(this).data("resizable-alsoresize", { + width: parseInt($(this).width(), 10), height: parseInt($(this).height= (), 10), + left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('t= op'), 10) + }); + }); + }; + + if (typeof(o.alsoResize) =3D=3D 'object' && !o.alsoResize.parentNode) { + if (o.alsoResize.length) { o.alsoResize =3D o.alsoResize[0]; _store(o.a= lsoResize); } + else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); } + }else{ + _store(o.alsoResize); + } + }, + + resize: function(event, ui){ + var self =3D $(this).data("resizable"), o =3D self.options, os =3D self.= originalSize, op =3D self.originalPosition; + + var delta =3D { + height: (self.size.height - os.height) || 0, width: (self.size.width - = os.width) || 0, + top: (self.position.top - op.top) || 0, left: (self.position.left - op.= left) || 0 + }, + + _alsoResize =3D function(exp, c) { + $(exp).each(function() { + var el =3D $(this), start =3D $(this).data("resizable-alsoresize"), st= yle =3D {}, css =3D c && c.length ? c : ['width', 'height', 'top', 'left']; + + $.each(css || ['width', 'height', 'top', 'left'], function(i, prop) { + var sum =3D (start[prop]||0) + (delta[prop]||0); + if (sum && sum >=3D 0) + style[prop] =3D sum || null; + }); + + //Opera fixing relative position + if (/relative/.test(el.css('position')) && $.browser.opera) { + self._revertToRelativePosition =3D true; + el.css({ position: 'absolute', top: 'auto', left: 'auto' }); + } + + el.css(style); + }); + }; + + if (typeof(o.alsoResize) =3D=3D 'object' && !o.alsoResize.nodeType) { + $.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); }); + }else{ + _alsoResize(o.alsoResize); + } + }, + + stop: function(event, ui){ + var self =3D $(this).data("resizable"); + + //Opera fixing relative position + if (self._revertToRelativePosition && $.browser.opera) { + self._revertToRelativePosition =3D false; + el.css({ position: 'relative' }); + } + + $(this).removeData("resizable-alsoresize-start"); + } +}); + +$.ui.plugin.add("resizable", "animate", { + + stop: function(event, ui) { + var self =3D $(this).data("resizable"), o =3D self.options; + + var pr =3D self._proportionallyResizeElements, ista =3D pr.length && (/t= extarea/i).test(pr[0].nodeName), + soffseth =3D ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump hei= ght */ ? 0 : self.sizeDiff.height, + soffsetw =3D ista ? 0 : self.sizeDiff.width; + + var style =3D { width: (self.size.width - soffsetw), height: (self.size.= height - soffseth) }, + left =3D (parseInt(self.element.css('left'), 10) + (self.position.lef= t - self.originalPosition.left)) || null, + top =3D (parseInt(self.element.css('top'), 10) + (self.position.top = - self.originalPosition.top)) || null; + + self.element.animate( + $.extend(style, top && left ? { top: top, left: left } : {}), { + duration: o.animateDuration, + easing: o.animateEasing, + step: function() { + + var data =3D { + width: parseInt(self.element.css('width'), 10), + height: parseInt(self.element.css('height'), 10), + top: parseInt(self.element.css('top'), 10), + left: parseInt(self.element.css('left'), 10) + }; + + if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.h= eight }); + + // propagating resize, and updating values for each animation step + self._updateCache(data); + self._propagate("resize", event); + + } + } + ); + } + +}); + +$.ui.plugin.add("resizable", "containment", { + + start: function(event, ui) { + var self =3D $(this).data("resizable"), o =3D self.options, el =3D self.= element; + var oc =3D o.containment, ce =3D (oc instanceof $) ? oc.get(0) : (/paren= t/.test(oc)) ? el.parent().get(0) : oc; + if (!ce) return; + + self.containerElement =3D $(ce); + + if (/document/.test(oc) || oc =3D=3D document) { + self.containerOffset =3D { left: 0, top: 0 }; + self.containerPosition =3D { left: 0, top: 0 }; + + self.parentData =3D { + element: $(document), left: 0, top: 0, + width: $(document).width(), height: $(document).height() || document.b= ody.parentNode.scrollHeight + }; + } + + // i'm a node, so compute top, left, right, bottom + else { + var element =3D $(ce), p =3D []; + $([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = =3D num(element.css("padding" + name)); }); + + self.containerOffset =3D element.offset(); + self.containerPosition =3D element.position(); + self.containerSize =3D { height: (element.innerHeight() - p[3]), width:= (element.innerWidth() - p[1]) }; + + var co =3D self.containerOffset, ch =3D self.containerSize.height, cw = =3D self.containerSize.width, + width =3D ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), heigh= t =3D ($.ui.hasScroll(ce) ? ce.scrollHeight : ch); + + self.parentData =3D { + element: ce, left: co.left, top: co.top, width: width, height: height + }; + } + }, + + resize: function(event, ui) { + var self =3D $(this).data("resizable"), o =3D self.options, + ps =3D self.containerSize, co =3D self.containerOffset, cs =3D self.si= ze, cp =3D self.position, + pRatio =3D self._aspectRatio || event.shiftKey, cop =3D { top:0, left:= 0 }, ce =3D self.containerElement; + + if (ce[0] !=3D document && (/static/).test(ce.css('position'))) cop =3D = co; + + if (cp.left < (self._helper ? co.left : 0)) { + self.size.width =3D self.size.width + (self._helper ? (self.position.le= ft - co.left) : (self.position.left - cop.left)); + if (pRatio) self.size.height =3D self.size.width / o.aspectRatio; + self.position.left =3D o.helper ? co.left : 0; + } + + if (cp.top < (self._helper ? co.top : 0)) { + self.size.height =3D self.size.height + (self._helper ? (self.position.= top - co.top) : self.position.top); + if (pRatio) self.size.width =3D self.size.height * o.aspectRatio; + self.position.top =3D self._helper ? co.top : 0; + } + + self.offset.left =3D self.parentData.left+self.position.left; + self.offset.top =3D self.parentData.top+self.position.top; + + var woset =3D Math.abs( (self._helper ? self.offset.left - cop.left : (s= elf.offset.left - cop.left)) + self.sizeDiff.width ), + hoset =3D Math.abs( (self._helper ? self.offset.top - cop.top : (self= .offset.top - co.top)) + self.sizeDiff.height ); + + var isParent =3D self.containerElement.get(0) =3D=3D self.element.parent= ().get(0), + isOffsetRelative =3D /relative|absolute/.test(self.containerElement.= css('position')); + + if(isParent && isOffsetRelative) woset -=3D self.parentData.left; + + if (woset + self.size.width >=3D self.parentData.width) { + self.size.width =3D self.parentData.width - woset; + if (pRatio) self.size.height =3D self.size.width / self.aspectRatio; + } + + if (hoset + self.size.height >=3D self.parentData.height) { + self.size.height =3D self.parentData.height - hoset; + if (pRatio) self.size.width =3D self.size.height * self.aspectRatio; + } + }, + + stop: function(event, ui){ + var self =3D $(this).data("resizable"), o =3D self.options, cp =3D self.= position, + co =3D self.containerOffset, cop =3D self.containerPosition, ce =3D se= lf.containerElement; + + var helper =3D $(self.helper), ho =3D helper.offset(), w =3D helper.oute= rWidth() - self.sizeDiff.width, h =3D helper.outerHeight() - self.sizeDiff.= height; + + if (self._helper && !o.animate && (/relative/).test(ce.css('position'))) + $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h }= ); + + if (self._helper && !o.animate && (/static/).test(ce.css('position'))) + $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h }= ); + + } +}); + +$.ui.plugin.add("resizable", "ghost", { + + start: function(event, ui) { + + var self =3D $(this).data("resizable"), o =3D self.options, cs =3D self.= size; + + self.ghost =3D self.originalElement.clone(); + self.ghost + .css({ opacity: .25, display: 'block', position: 'relative', height: cs= .height, width: cs.width, margin: 0, left: 0, top: 0 }) + .addClass('ui-resizable-ghost') + .addClass(typeof o.ghost =3D=3D 'string' ? o.ghost : ''); + + self.ghost.appendTo(self.helper); + + }, + + resize: function(event, ui){ + var self =3D $(this).data("resizable"), o =3D self.options; + if (self.ghost) self.ghost.css({ position: 'relative', height: self.size= .height, width: self.size.width }); + }, + + stop: function(event, ui){ + var self =3D $(this).data("resizable"), o =3D self.options; + if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost= .get(0)); + } + +}); + +$.ui.plugin.add("resizable", "grid", { + + resize: function(event, ui) { + var self =3D $(this).data("resizable"), o =3D self.options, cs =3D self.= size, os =3D self.originalSize, op =3D self.originalPosition, a =3D self.ax= is, ratio =3D o._aspectRatio || event.shiftKey; + o.grid =3D typeof o.grid =3D=3D "number" ? [o.grid, o.grid] : o.grid; + var ox =3D Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[= 0]||1), oy =3D Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.gr= id[1]||1); + + if (/^(se|s|e)$/.test(a)) { + self.size.width =3D os.width + ox; + self.size.height =3D os.height + oy; + } + else if (/^(ne)$/.test(a)) { + self.size.width =3D os.width + ox; + self.size.height =3D os.height + oy; + self.position.top =3D op.top - oy; + } + else if (/^(sw)$/.test(a)) { + self.size.width =3D os.width + ox; + self.size.height =3D os.height + oy; + self.position.left =3D op.left - ox; + } + else { + self.size.width =3D os.width + ox; + self.size.height =3D os.height + oy; + self.position.top =3D op.top - oy; + self.position.left =3D op.left - ox; + } + } + +}); + +var num =3D function(v) { + return parseInt(v, 10) || 0; +}; + +var isNumber =3D function(value) { + return !isNaN(parseInt(value, 10)); +}; + +})(jQuery); --===============7811957639004761277==-- From richfaces-svn-commits at lists.jboss.org Wed Apr 28 23:34:22 2010 Content-Type: multipart/mixed; boundary="===============1114323338966273104==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16836 - branches/enterprise/3.3.X/docs/common-resources. Date: Wed, 28 Apr 2010 23:34:22 -0400 Message-ID: <201004290334.o3T3YMFB019461@svn01.web.mwc.hst.phx2.redhat.com> --===============1114323338966273104== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: SeanRogers Date: 2010-04-28 23:34:21 -0400 (Wed, 28 Apr 2010) New Revision: 16836 Modified: branches/enterprise/3.3.X/docs/common-resources/pom.xml Log: Adding note on circular references (RFPL-562) Modified: branches/enterprise/3.3.X/docs/common-resources/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.X/docs/common-resources/pom.xml 2010-04-29 01:4= 0:35 UTC (rev 16835) +++ branches/enterprise/3.3.X/docs/common-resources/pom.xml 2010-04-29 03:3= 4:21 UTC (rev 16836) @@ -26,4 +26,4 @@ - \ No newline at end of file + --===============1114323338966273104==-- From richfaces-svn-commits at lists.jboss.org Wed Apr 28 23:42:52 2010 Content-Type: multipart/mixed; boundary="===============4752187398383091824==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16837 - branches/enterprise/3.3.X/docs/userguide/en/src/main/docbook/modules. Date: Wed, 28 Apr 2010 23:42:51 -0400 Message-ID: <201004290342.o3T3gp7r020440@svn01.web.mwc.hst.phx2.redhat.com> --===============4752187398383091824== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: SeanRogers Date: 2010-04-28 23:42:51 -0400 (Wed, 28 Apr 2010) New Revision: 16837 Modified: branches/enterprise/3.3.X/docs/userguide/en/src/main/docbook/modules/RFC= architectover.xml Log: Adding note on circular references (RFPL-562) Modified: branches/enterprise/3.3.X/docs/userguide/en/src/main/docbook/modu= les/RFCarchitectover.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.X/docs/userguide/en/src/main/docbook/modules/RF= Carchitectover.xml 2010-04-29 03:34:21 UTC (rev 16836) +++ branches/enterprise/3.3.X/docs/userguide/en/src/main/docbook/modules/RF= Carchitectover.xml 2010-04-29 03:42:51 UTC (rev 16837) @@ -188,6 +188,18 @@ Render Response Phase RichFaces framework makes = a traversal of the component tree, calls its own renderer and put the result into= the Faces Response. + + + + Certain components in the RichFaces framework al= low data to be serialized and transferred from the server to the client. If= the data model being used contains circular references, serialization of t= he data fails due to a stack overflow. + + + Circular references are unsupported and should be avoided; however, <= xref linkend=3D"Avoiding_Circular_References" /> shows how to prevent a sta= ck overflow due to circular references. Serialization of the data is done f= rom the top-most object down, and circular references back to parent object= s are ignored. Access to non-serialized references to parent objects is not= available using this method. + + + Avoiding Circular References + Code sample + --===============4752187398383091824==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 08:16:34 2010 Content-Type: multipart/mixed; boundary="===============7317537724535773791==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16838 - in root/ui-sandbox/trunk/components/datascroller/ui/src/main: resources/META-INF/resources/css and 2 other directories. Date: Thu, 29 Apr 2010 08:16:34 -0400 Message-ID: <201004291216.o3TCGY5x016182@svn01.web.mwc.hst.phx2.redhat.com> --===============7317537724535773791== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 08:16:33 -0400 (Thu, 29 Apr 2010) New Revision: 16838 Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richf= aces/renderkit/DataScrollerBaseRenderer.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META= -INF/resources/css/datascroller.css root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META= -INF/resources/script/datascroller.js root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/data= scroller.template.xml Log: use instead of = Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/or= g/richfaces/renderkit/DataScrollerBaseRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/rich= faces/renderkit/DataScrollerBaseRenderer.java 2010-04-29 03:42:51 UTC (rev = 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/rich= faces/renderkit/DataScrollerBaseRenderer.java 2010-04-29 12:16:33 UTC (rev = 16838) @@ -204,7 +204,7 @@ styleClass=3D""; } = - out.startElement(HTML.SPAN_ELEM, component); + out.startElement(HTML.A_ELEMENT, component); = if (isCurrentPage) { out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital ds_cu= rrent " + styleClass, null); @@ -212,6 +212,9 @@ out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital " + s= tyleClass, null); } = + out.writeAttribute(HTML.HREF_ATTR, "javascript:void(0);", null= ); + = + = if (null !=3D style) { out.writeAttribute(HTML.STYLE_ATTRIBUTE, style, null); } @@ -224,7 +227,7 @@ digital.put(id, page); = out.writeText(page, null); - out.endElement(HTML.SPAN_ELEM); + out.endElement(HTML.A_ELEMENT); } = return digital; @@ -293,7 +296,6 @@ = StringBuffer buffer =3D new StringBuffer(); function.appendScript(buffer); - = definition.addToBody(buffer); return definition; } Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resourc= es/META-INF/resources/css/datascroller.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/css/datascroller.css 2010-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/css/datascroller.css 2010-04-29 12:16:33 UTC (rev 16838) @@ -20,6 +20,8 @@ font-size : 11px/*generalSizeFont*/; = font-family : verdana/*generalFamilyFont*/; = color : #000000/*generalTextColor*/; + text-decoration:none; + font-weight: normal; } = .ds_left{ = @@ -42,8 +44,11 @@ background : url(images/bg_field.png) top left repeat-x/*gradient - from = additionalBackgroundColor to tableBackgroundColor, background-color - table= BackgroundColor*/; = display : inline-block; = font-size : 11px/*generalSizeFont*/; = - font-family : verdana/*generalFamilyFont*/; = + font-family : verdana/*generalFamilyFont*/; + text-decoration:none; = color : #000000/*generalTextColor*/; + font-weight: normal; + = } = .ds_over{ = Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resourc= es/META-INF/resources/script/datascroller.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/script/datascroller.js 2010-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/script/datascroller.js 2010-04-29 12:16:33 UTC (rev 16838) @@ -2,16 +2,62 @@ = richfaces.ui =3D richfaces.ui || {}; = - richfaces.ui.DataScroller =3D function(id, submit, options) { + var initButtons =3D function(buttons, css, component) { + var id; + + var fn =3D function(e) { + e.data.fn.call(e.data.component, e); + } + = + var data =3D {}; + data.component =3D component; + + for(id in buttons) { + var element =3D $(document.getElementById(id)); + = + data.id =3D id; + data.page =3D buttons[id]; + data.element =3D element; + data.fn =3D component.processClick; + + element.bind('click', copy(data), fn); + = + if(css) { + data.fn =3D component.processStyles; + data.css =3D css.mousedown; + element.bind('mousedown', copy(data), fn); + = + data.css =3D css.mouseup; + element.bind('mouseup', copy(data), fn); + = + data.css =3D css.mouseout; + element.bind('mouseout', copy(data), fn); + = + data.css =3D css.mouseover; + element.bind('mouseover', copy(data), fn); + } + } + }; + = + var copy =3D function(data) { + var key; + var eventData =3D {}; + = + for (key in data) { + eventData[key] =3D data[key]; + } + = + return eventData; + }; + = + richfaces.ui.DataScroller =3D function(id, submit, options) { = $super.constructor.call(this,id); - this.attachToDom.call(this, id); = this.options =3D options; = this.currentPage =3D options.currentPage; - = - var buttons =3D options.buttons; + var buttons =3D options.buttons; var digitals =3D options.digitals; = if (submit && typeof submit =3D=3D 'function') { @@ -26,16 +72,14 @@ css.mouseup =3D "ds_button ds_left"; css.mouseout =3D "ds_button ds_left"; css.mousedown =3D "ds_button ds_left ds_over"; - = - this.initButtons(leftButtons,css); + initButtons(leftButtons,css, this); = var rightButtons =3D buttons.right; css.mouseover =3D "ds_button ds_right ds_over"; css.mouseup =3D "ds_button ds_right"; css.mouseout =3D "ds_button ds_right"; css.mousedown =3D "ds_button ds_right ds_over"; - = - this.initButtons(rightButtons,css); + initButtons(rightButtons,css, this); } = if(digitals) { @@ -43,95 +87,41 @@ css.mouseup=3D "ds_digital ds_over"; css.mouseout =3D "ds_digital"; css.mousedown=3D"ds_digital ds_press"; - - this.initButtons(digitals,css); + initButtons(digitals, css,this); } }; = var $super =3D richfaces.BaseComponent.extend(richfaces.BaseComponent,= richfaces.ui.DataScroller); = $.extend(richfaces.ui.DataScroller.prototype, (function (options) { - = - var copy =3D function(data) { - var key; - var eventData =3D {}; - = - for (key in data) { - eventData[key] =3D data[key]; - } - = - return eventData; - }; - = - var processStyles =3D function(event) { - var data =3D event.data; - = - if(data && (data.page !=3D this.currentPage)) { - var element =3D data.element; - var css =3D data.css; - = - if(element && css) { - element.attr('class', css); - } - } - - }; - = - var processClick =3D function(event) { - var data =3D event.data; - = - if(data) { - var page =3D data.page; - if(page) { - this.switchToPage(page); - } - } - } - = - var scrollEventName =3D "rich:datascroller:onscroll"; + = + var scrollEventName =3D "rich:datascroller:onscroll"; = return { = name: "RichFaces.ui.DataScroller", + + processClick: function(event) { + var data =3D event.data; + if(data) { + var page =3D data.page; + if(page) { + this.switchToPage(page); + } + } + }, = = - initButtons: function(buttons, css) { + processStyles: function(event) { + var data =3D event.data; = - var id; - = - var fn =3D function(e) { - e.data.fn.call(e.data.component, e, this); + if(data && (data.page !=3D this.currentPage)) { + var element =3D data.element; + var css =3D data.css; + = + if(element && css) { + element.attr('class', css); + } } - = - var data =3D {}; - data.component =3D this; - = - for(id in buttons) { - = - var element =3D $(document.getElementById(id)); - = - data.id =3D id; - data.page =3D buttons[id]; - data.element =3D element; - data.fn =3D processClick; - - element.bind('click', copy(data), fn); - = - if(css) { - data.fn =3D processStyles; - = - data.css =3D css.mousedown; - element.bind('mousedown', copy(data), fn); - = - data.css =3D css.mouseup; - element.bind('mouseup', copy(data), fn); - = - data.css =3D css.mouseout; - element.bind('mouseout', copy(data), fn); - = - data.css =3D css.mouseover; - element.bind('mouseover', copy(data), fn); - } - } }, = switchToPage: function(page) { Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/templat= es/datascroller.template.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/dat= ascroller.template.xml 2010-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/dat= ascroller.template.xml 2010-04-29 12:16:33 UTC (rev 16838) @@ -20,14 +20,14 @@ - + «« - + - «« - + @@ -36,14 +36,14 @@ - + « - + - + « - + @@ -53,14 +53,14 @@ - + » - + - + » - + @@ -68,14 +68,14 @@ - + »» - + - + »» - + --===============7317537724535773791==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 08:17:53 2010 Content-Type: multipart/mixed; boundary="===============6187083393658492889==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16839 - in root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/richfaces: renderkit and 2 other directories. Date: Thu, 29 Apr 2010 08:17:52 -0400 Message-ID: <201004291217.o3TCHqmp016206@svn01.web.mwc.hst.phx2.redhat.com> --===============6187083393658492889== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 08:17:51 -0400 (Thu, 29 Apr 2010) New Revision: 16839 Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/component/behavior/ComponentControlBehavior.java root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/renderkit/ComponentControlBehaviorRenderer.java root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/tag/BehaviorRule.java root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/tag/BehaviorTagHandlerDelegate.java root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/taglib/ComponentControlHandler.java Log: add comments, wrapping support Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/component/behavior/ComponentControlBehavior.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/component/behavior/ComponentControlBehavior.java 2010-04-29 12:16:33= UTC (rev 16838) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/component/behavior/ComponentControlBehavior.java 2010-04-29 12:17:51= UTC (rev 16839) @@ -6,6 +6,10 @@ import javax.faces.component.UIComponent; import javax.faces.component.behavior.FacesBehavior; = +/** + * @author Anton Belevich + * + */ @FacesBehavior(value=3D"org.richfaces.behavior.ComponentControlBehavior") public class ComponentControlBehavior extends ClientBehavior { = Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/renderkit/ComponentControlBehaviorRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-04-29 12:16:33 = UTC (rev 16838) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-04-29 12:17:51 = UTC (rev 16839) @@ -23,6 +23,10 @@ import org.richfaces.component.behavior.ComponentControlBehavior; = = +/** + * @author Anton Belevich + * + */ @FacesBehaviorRenderer(rendererType=3D"org.richfaces.behavior.ComponentCon= trolBehavior", renderKitId=3DRenderKitFactory.HTML_BASIC_RENDER_KIT) @ResourceDependencies( {@ResourceDependency(library =3D "javax.faces", nam= e =3D "jsf.js"), @ResourceDependency(name =3D "jquery.js"), Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/tag/BehaviorRule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorRule.java 2010-04-29 12:16:33 UTC (rev 16838) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorRule.java 2010-04-29 12:17:51 UTC (rev 16839) @@ -10,6 +10,10 @@ import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; = +/** + * @author Anton Belevich + * + */ public class BehaviorRule extends MetaRule { = private static Logger log =3D RichfacesLogger.CONNECTION.getLogger(); Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/tag/BehaviorTagHandlerDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorTagHandlerDelegate.java 2010-04-29 12:16:33 UTC (rev 168= 38) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorTagHandlerDelegate.java 2010-04-29 12:17:51 UTC (rev 168= 39) @@ -5,25 +5,32 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.view.AttachedObjectHandler; -import javax.faces.view.facelets.BehaviorHandler; import javax.faces.view.facelets.FaceletContext; import javax.faces.view.facelets.MetaRuleset; import javax.faces.view.facelets.TagHandlerDelegate; = +/** + * @author Anton Belevich + * + */ public class BehaviorTagHandlerDelegate extends TagHandlerDelegate implem= ents AttachedObjectHandler { = TagHandlerDelegate wrappedHandlerDelegate; = - BehaviorHandler owner; + CustomBehaviorHandler owner; = - public BehaviorTagHandlerDelegate(BehaviorHandler owner, TagHandlerDel= egate wrappedHandlerDelegate) { + public BehaviorTagHandlerDelegate(CustomBehaviorHandler owner, TagHand= lerDelegate wrappedHandlerDelegate) { this.owner =3D owner; this.wrappedHandlerDelegate =3D wrappedHandlerDelegate; } = @Override public void apply(FaceletContext ctx, UIComponent comp) throws IOExcep= tion { - wrappedHandlerDelegate.apply(ctx, comp); + if(owner.isWrapping()) { + owner.applyNextHandler(ctx, comp); + } else { + wrappedHandlerDelegate.apply(ctx, comp); + } = } = @Override Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/taglib/ComponentControlHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/taglib/ComponentControlHandler.java 2010-04-29 12:16:33 UTC (rev 168= 38) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/taglib/ComponentControlHandler.java 2010-04-29 12:17:51 UTC (rev 168= 39) @@ -20,6 +20,10 @@ import org.richfaces.component.behavior.ComponentControlBehavior; import org.richfaces.tag.CustomBehaviorHandler; = +/** + * @author Anton Belevich + * + */ public class ComponentControlHandler extends CustomBehaviorHandler { = public ComponentControlHandler(BehaviorConfig config) { @@ -85,5 +89,10 @@ private boolean isUIParameter(String type) { return (UIParameter.COMPONENT_TYPE.equals(type) || UIHashParamete= r.COMPONENT_TYPE.equals(type)); } + + @Override + public boolean isWrapping() { + return false; + } } = --===============6187083393658492889==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 08:31:52 2010 Content-Type: multipart/mixed; boundary="===============7629692474531637938==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16840 - root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/richfaces/tag. Date: Thu, 29 Apr 2010 08:31:52 -0400 Message-ID: <201004291231.o3TCVqwp018327@svn01.web.mwc.hst.phx2.redhat.com> --===============7629692474531637938== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 08:31:50 -0400 (Thu, 29 Apr 2010) New Revision: 16840 Added: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/tag/CustomBehaviorHandler.java Log: base hadler for the behaviors Added: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/= richfaces/tag/CustomBehaviorHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/CustomBehaviorHandler.java (rev 0) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/CustomBehaviorHandler.java 2010-04-29 12:31:50 UTC (rev 16840) @@ -0,0 +1,29 @@ +package org.richfaces.tag; + +import javax.faces.view.facelets.BehaviorConfig; +import javax.faces.view.facelets.BehaviorHandler; +import javax.faces.view.facelets.TagHandlerDelegate; + + +/** + * @author Anton Belevich + * + */ +public abstract class CustomBehaviorHandler extends BehaviorHandler { + + TagHandlerDelegate helper; + = + public CustomBehaviorHandler(BehaviorConfig config) { + super(config); + } + = + public abstract boolean isWrapping(); + = + @Override + protected TagHandlerDelegate getTagHandlerDelegate() { + if(helper =3D=3D null) { + helper =3D new BehaviorTagHandlerDelegate(this, delegateFactor= y.createBehaviorHandlerDelegate(this)); = + } + return helper; + } +} --===============7629692474531637938==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 09:20:28 2010 Content-Type: multipart/mixed; boundary="===============1139754219260981433==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16841 - in root/examples-sandbox/trunk/components/tables/src/main: java/org/richfaces/demo/utils and 1 other directories. Date: Thu, 29 Apr 2010 09:20:28 -0400 Message-ID: <201004291320.o3TDKSs3030461@svn01.web.mwc.hst.phx2.redhat.com> --===============1139754219260981433== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 09:20:27 -0400 (Thu, 29 Apr 2010) New Revision: 16841 Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richface= s/demo/DataBean.java root/examples-sandbox/trunk/components/tables/src/main/java/org/richface= s/demo/utils/EmployeeUtils.java root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml Log: Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/r= ichfaces/demo/DataBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfac= es/demo/DataBean.java 2010-04-29 12:31:50 UTC (rev 16840) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfac= es/demo/DataBean.java 2010-04-29 13:20:27 UTC (rev 16841) @@ -21,6 +21,47 @@ = Map stateMap =3D new HashMap(); = = + private String test1 =3D "test1"; + = + private String test2 =3D "test2"; + = + private String target =3D "targetId"; + = + private String operation =3D "operation"; + = + = + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target =3D target; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation =3D operation; + } + + public String getTest1() { + return test1; + } + + public void setTest1(String test1) { + this.test1 =3D test1; + } + + public String getTest2() { + return test2; + } + + public void setTest2(String test2) { + this.test2 =3D test2; + } + int page =3D 1; = = public int getPage() { Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/r= ichfaces/demo/utils/EmployeeUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfac= es/demo/utils/EmployeeUtils.java 2010-04-29 12:31:50 UTC (rev 16840) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfac= es/demo/utils/EmployeeUtils.java 2010-04-29 13:20:27 UTC (rev 16841) @@ -14,7 +14,7 @@ List employeeList =3D new ArrayList(); = addEmployeeToCollection(employeeList, "9Alexander Ivanov", "Direct= or", "aivanov(a)beltelecom.by", "AMicrosoft", "+375 29 255 00 00", "Minsk, = Belarus"); - addEmployeeToCollection(employeeList, "4Bill Gates", "President", = "bgates(a)microsoft.com", "AMicrosoft", "817-335-5881", "Tokyo, Japan"); + addEmployeeToCollection(employeeList, "4Bill Gates", "President", "b= gates(a)microsoft.com", "AMicrosoft", "817-335-5881", "Tokyo, Japan"); addEmployeeToCollection(employeeList, "Amanda Gellhouse", "IT/Inte= rnet Support; Manager", "agellhouse(a)sun.com", "Sun", "853-729-3784", "Sun= Valley, USA"); addEmployeeToCollection(employeeList, "2Hideo Kodzima", "Vice Prez= ident", "khideo(a)konami.jp", "AMicrosoft", "419-615-2730", "Tokyo, Japan"); addEmployeeToCollection(employeeList, "3Stan Carpenter", "Lead Des= igner", "scarpenter(a)ndogs.com", "AMicrosoft", "714-647-3380", "Tokyo, Jap= an"); @@ -633,7 +633,7 @@ addEmployeeToCollection(employeeList, "Daniel Crespo", "IT/Interne= t Support; Analyst", "dcrespo(a)bokken.com", "Bokken As", "+91-22-6659-7300= ", "Wien, Austria"); addEmployeeToCollection(employeeList, "Petr Cumba", "IT-chef", "pc= umba(a)abarta.com", "ABARTA, Inc.", "701-277-0403", "Liberal, KS United Sta= tes"); addEmployeeToCollection(employeeList, "James Curley", "Network Man= ager", "jcurley(a)triboro.com", "Triboro Gulf", "+047-52020000", "Nesflaten= , Rogaland Norway"); - addEmployeeToCollection(employeeList, "Lu Dam", "SVP Operations an= d Technical", "ludam(a)krepro.com", "Krepro As", "313-876-0190", "Walters, = OK United States"); + addEmployeeToCollection(employeeList, "Lu Dam", "SVP Operations an= d Technical", "ludam(a)krepro.com", "Krepro As", "313-876-0190", "Walters, = OK United States");/* addEmployeeToCollection(employeeList, "Randy Davenport", "Database= Administrator", "rdevenport(a)savatrip.com", "Sav-A-Trip, Inc", "+032-3880= 7700", "Adelaide, Australia"); addEmployeeToCollection(employeeList, "Kevin A. Kohlscheen", "Comp= uter Specialist", "kakohlscheen(a)eni.com", "Eni S.p.A.", "+031-455223300",= "Andria, Bari Italy"); addEmployeeToCollection(employeeList, "M Koetsier", "Programmer", = "mkoetsier(a)pinnergy.com", "Pinnergy Ltd", "316-838-4663", "Moscow, Russi= a"); @@ -1345,7 +1345,7 @@ addEmployeeToCollection(employeeList, "Andy Kirkham", "VP Administ= ration", "akirkham(a)pacificorp.com", "Pacificorp", "561-642-2153", "Ashton= , ID United States"); addEmployeeToCollection(employeeList, "Derrik Khoo Sin Huat", "CTO= ", "aksinhuat(a)aes.com", "The AES Corporation", "864-233-4064", "Sydney, = Australia"); addEmployeeToCollection(employeeList, "Rick Kelsven", "Network Ana= lyst", "rkelsven(a)rudny.com", "Rudny's Inc", "208-356-4991", "Bangkok, Th= ailand"); - +*/ return employeeList; } = Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/hom= e.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtm= l 2010-04-29 12:31:50 UTC (rev 16840) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtm= l 2010-04-29 13:20:27 UTC (rev 16841) @@ -5,6 +5,8 @@ xmlns:ui=3D"http://java.sun.com/jsf/facelets" xmlns:rich=3D"http://richfaces.org/rich" xmlns:ds=3D"http://richfaces.org/datascroller" + xmlns:cc=3D"http://richfaces.org/componentControl" + = > = @@ -27,7 +29,11 @@ - = + = + + = + + = @@ -47,7 +53,7 @@ = = - + = @@ -74,7 +80,36 @@ =
- + = + + = + = + + + + + + = + + + + = --===============1139754219260981433==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 09:55:56 2010 Content-Type: multipart/mixed; boundary="===============0514602920152592209==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16842 - root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/script. Date: Thu, 29 Apr 2010 09:55:56 -0400 Message-ID: <201004291355.o3TDtuGF002177@svn01.web.mwc.hst.phx2.redhat.com> --===============0514602920152592209== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 09:55:56 -0400 (Thu, 29 Apr 2010) New Revision: 16842 Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META= -INF/resources/script/datascroller.js Log: attachToDom support Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resourc= es/META-INF/resources/script/datascroller.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/script/datascroller.js 2010-04-29 13:20:27 UTC (rev 16841) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/MET= A-INF/resources/script/datascroller.js 2010-04-29 13:55:56 UTC (rev 16842) @@ -53,8 +53,9 @@ richfaces.ui.DataScroller =3D function(id, submit, options) { = $super.constructor.call(this,id); - this.attachToDom.call(this, id); = + $p.attachToDom.call(this, id); + = this.options =3D options; = this.currentPage =3D options.currentPage; var buttons =3D options.buttons; @@ -92,6 +93,8 @@ }; = var $super =3D richfaces.BaseComponent.extend(richfaces.BaseComponent,= richfaces.ui.DataScroller); + var $p =3D richfaces.BaseComponent.extend(richfaces.BaseComponent,rich= faces.ui.DataScroller, {}); + var $super =3D richfaces.ui.DataScroller.$super; = $.extend(richfaces.ui.DataScroller.prototype, (function (options) { = --===============0514602920152592209==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 09:56:41 2010 Content-Type: multipart/mixed; boundary="===============5010351778674654721==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16843 - root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/richfaces/tag. Date: Thu, 29 Apr 2010 09:56:41 -0400 Message-ID: <201004291356.o3TDufNg002194@svn01.web.mwc.hst.phx2.redhat.com> --===============5010351778674654721== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 09:56:40 -0400 (Thu, 29 Apr 2010) New Revision: 16843 Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/rich= faces/tag/BehaviorTagHandlerDelegate.java Log: Modified: root/ui-sandbox/trunk/components/componentcontrol/src/main/java/o= rg/richfaces/tag/BehaviorTagHandlerDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorTagHandlerDelegate.java 2010-04-29 13:55:56 UTC (rev 168= 42) +++ root/ui-sandbox/trunk/components/componentcontrol/src/main/java/org/ric= hfaces/tag/BehaviorTagHandlerDelegate.java 2010-04-29 13:56:40 UTC (rev 168= 43) @@ -27,6 +27,7 @@ @Override public void apply(FaceletContext ctx, UIComponent comp) throws IOExcep= tion { if(owner.isWrapping()) { + //TODO: anton create behavior and place it in BehaviorStack owner.applyNextHandler(ctx, comp); } else { wrappedHandlerDelegate.apply(ctx, comp); --===============5010351778674654721==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 10:11:42 2010 Content-Type: multipart/mixed; boundary="===============9077007350992533029==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16844 - root/framework/trunk/impl/src/main/resources/META-INF/resources. Date: Thu, 29 Apr 2010 10:11:42 -0400 Message-ID: <201004291411.o3TEBgZO009662@svn01.web.mwc.hst.phx2.redhat.com> --===============9077007350992533029== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: pyaschenko Date: 2010-04-29 10:11:41 -0400 (Thu, 29 Apr 2010) New Revision: 16844 Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richface= s-queue.js Log: queue form search was added Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/r= ichfaces-queue.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfac= es-queue.js 2010-04-29 13:56:40 UTC (rev 16843) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfac= es-queue.js 2010-04-29 14:11:41 UTC (rev 16844) @@ -2,7 +2,7 @@ * @author Pavel Yaschenko */ = -(function(jQuery, richfaces, jsf) { +(function($, richfaces, jsf) { = /** * RichFaces Ajax container = @@ -58,14 +58,31 @@ this.source =3D source; this.options =3D options || {}; this.queueOptions =3D {} + var id; + = + // find default options for QueueEntry if (options.hasOwnProperty("queueId")) { if (defaultQueueOptions[options.queueId]) { - this.queueOptions =3D defaultQueueOptions[options.queueId]; + id =3D options.queueId; } } else { - // TODO: find form options or use view options - this.queueOptions =3D defaultQueueOptions[DEFAULT_QUEUE_ID]; + var element =3D richfaces.getDomElement(source); + var form; + if (element) { + element =3D $(element).closest("form"); + if (element.length>0) { + form =3D element.get(0); + } + } + if (form && form.id && defaultQueueOptions[form.id]) { + id =3D form.id; + } else { + id =3D DEFAULT_QUEUE_ID; + } } + if (id) { + this.queueOptions =3D defaultQueueOptions[id]; + } this.event =3D event; = //similarityGroupingId is mutable, thus we need special field for it @@ -73,7 +90,7 @@ this.eventsCount =3D 1; }; = - jQuery.extend(QueueEntry.prototype, { + $.extend(QueueEntry.prototype, { = isIgnoreDupResponses: function() { return this.options.ignoreDupResponses; --===============9077007350992533029==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 11:53:41 2010 Content-Type: multipart/mixed; boundary="===============7336843531636131546==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16845 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces: component and 2 other directories. Date: Thu, 29 Apr 2010 11:53:41 -0400 Message-ID: <201004291553.o3TFrf1m027730@svn01.web.mwc.hst.phx2.redhat.com> --===============7336843531636131546== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 11:53:41 -0400 (Thu, 29 Apr 2010) New Revision: 16845 Removed: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/ColumnsIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/DataIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/FixedChildrenIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/IteratorBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/behavior/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/state/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/f= acelets/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/TogglerBehaviorRenderer.java Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/SubtableFixedChildrenIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/UIColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/UIDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/UIDataTableBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/UISubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/c= omponent/html/HtmlColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/AbstractRowsRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/ColumnGroupRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/HeaderEncodeStrategy.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/SubTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/r= enderkit/ToggleControlRendererBase.java Log: remove odd classes, small refactoring Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richf= aces/component/ColumnsIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/ColumnsIterator.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/ColumnsIterator.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -1,56 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIComponent; - -import org.richfaces.component.Column; - -/** - * Iterator for all children table columns. - * = - * @author asmirnov - * = - */ -class ColumnsIterator extends IteratorBase { - - protected Iterator childrenIterator; - - public ColumnsIterator(UIComponent dataTable) { - this.childrenIterator =3D dataTable.getChildren().iterator(); - } - - protected UIComponent nextItem() { - while (childrenIterator !=3D null && childrenIterator.hasNext()) { - UIComponent child =3D childrenIterator.next(); - if (child instanceof javax.faces.component.UIColumn || child i= nstanceof Column) { - return child; - } - } - - // TODO nick - free childrenIterator field - - return null; - } - -} Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richf= aces/component/DataIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/DataIterator.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/DataIterator.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -1,83 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIComponent; - -import org.richfaces.component.Column; - -//TODO nick - rename to include component name -class DataIterator extends IteratorBase { - - private Iterator facetsIterator; - - private Iterator childrenIterator; - - public DataIterator(UIDataTableBase dataTable) { - this.childrenIterator =3D dataTable.getChildren().iterator(); - this.facetsIterator =3D dataTable.getFacets().values().iterator(); - } - - protected UIComponent nextItem() { - - UIComponent nextColumn =3D null; - while (nextColumn =3D=3D null && childrenIterator.hasNext()) { - UIComponent child =3D childrenIterator.next(); - // TODO nick - why non-rendered children are filtered? - // TODO nick - should be (child instanceof UIColumn || child i= nstanceof Column)? - if ((child instanceof UIColumn) || (child instanceof Column)) { - nextColumn =3D child; - } else if (checkAjaxComponent(child)) { - nextColumn =3D child; - } - } - - // TODO nick - free childrenIterator - - // ??? - while (nextColumn =3D=3D null && facetsIterator.hasNext()) { - UIComponent component =3D facetsIterator.next(); - if (checkAjaxComponent(component)) { - nextColumn =3D component; - } - } - - // TODO nick - free facetsIterator - - return nextColumn; - } - - protected Iterator getFacetsIterator() { - return this.facetsIterator; - } - - protected Iterator getChildrenIterator() { - return this.childrenIterator; - } - - // TODO nick - what's this for? - protected boolean checkAjaxComponent(UIComponent child) { - return false; - } - -} Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richf= aces/component/FixedChildrenIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/FixedChildrenIterator.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/FixedChildrenIterator.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -1,83 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIComponent; - - -class FixedChildrenIterator extends DataIterator { - - private Iterator currentColumnIterator; - - public FixedChildrenIterator(UIDataTableBase dataTable) { - super(dataTable); - } - - @Override - protected UIComponent nextItem() { - UIComponent next =3D null; - - if (currentColumnIterator !=3D null && currentColumnIterator.hasNe= xt()) { - next =3D currentColumnIterator.next(); - checkColumnIterator(); - } - - if (next =3D=3D null) { - Iterator childrenIterator =3D getChildrenIterator= (); - while (next =3D=3D null && childrenIterator.hasNext()) { - UIComponent child =3D childrenIterator.next(); - if ((child instanceof UIColumn) && child.isRendered()) { - currentColumnIterator =3D getChildFacetIterator(child); - next =3D nextItem(); - } else if (checkAjaxComponent(child)) { - next =3D child; - } - } - } - - if (next =3D=3D null) { - next =3D getNextFacet(); - } - return next; - } - - protected UIComponent getNextFacet() { - Iterator facetsIterator =3D getFacetsIterator(); - // TODO nick - while -> if - while (facetsIterator.hasNext()) { - return facetsIterator.next(); - } - return null; - } - - protected void checkColumnIterator() { - if (!currentColumnIterator.hasNext()) { - currentColumnIterator =3D null; - } - } - - protected Iterator getChildFacetIterator(UIComponent comp= onent) { - return component.getFacets().values().iterator(); - } - -} Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richf= aces/component/IteratorBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/IteratorBase.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/IteratorBase.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -1,52 +0,0 @@ -package org.richfaces.component; - -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * @author Anton Belevich - * @author Nick Belaevski - */ -// TODO nick - rename this class -public abstract class IteratorBase implements Iterator { - - private boolean isCompleted =3D false; - - private E next =3D null; - - private void setupNext() { - if (!isCompleted) { - if (next =3D=3D null) { - next =3D nextItem(); - - if (next =3D=3D null) { - isCompleted =3D true; - } - } - } - } - - public boolean hasNext() { - setupNext(); - - return next !=3D null; - } - - public E next() { - setupNext(); - - if (next =3D=3D null) { - throw new NoSuchElementException(); - } - - E result =3D next; - next =3D null; - return result; - } - - public void remove() { - throw new UnsupportedOperationException("Iterator is read-only"); - } - - protected abstract E nextItem(); -} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/SubtableFixedChildrenIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/SubtableFixedChildrenIterator.java 2010-04-29 14:11:41 UTC (rev 1= 6844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/SubtableFixedChildrenIterator.java 2010-04-29 15:53:41 UTC (rev 1= 6845) @@ -27,7 +27,7 @@ * @author asmirnov * = */ -public class SubtableFixedChildrenIterator extends FixedChildrenIterator { +public class SubtableFixedChildrenIterator extends DataTableFixedChildrenI= terator { = public SubtableFixedChildrenIterator(UIDataTableBase dataTable) { super(dataTable); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/UIColumn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIColumn.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIColumn.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -36,6 +36,8 @@ protected enum PropertyKeys { filter, filterValue, comparator, sortOrder } + = + = public void setSortOrder(SortOrder sortOrder) { getStateHelper().put(PropertyKeys.sortOrder, sortOrder); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/UIColumnGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIColumnGroup.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIColumnGroup.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -40,7 +40,7 @@ = = public Iterator columns() { - return new ColumnsIterator(this); + return new DataTableColumnsIterator(this); } = public void setBreakBefore(boolean newBreakBefore) { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/UIDataTable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIDataTable.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIDataTable.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -21,6 +21,7 @@ sortingExpression } = + = public void setSortingListener(MethodExpression sortingExpression) { //TODO nick - use addToggleListener() & MethodExpression wrapper i= n tag getStateHelper().put(PropertyKeys.sortingExpression, sortingExpres= sion); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/UIDataTableBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIDataTableBase.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UIDataTableBase.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -47,18 +47,19 @@ filterVar, sortPriority, sortMode, first, rows, noDataLabel } = + = public Iterator columns() { - return new ColumnsIterator(this); + return new DataTableColumnsIterator(this); } = @Override protected Iterator fixedChildren() { - return new FixedChildrenIterator(this); + return new DataTableFixedChildrenIterator(this); } = @Override protected Iterator dataChildren() { - return new DataIterator(this); + return new DataTableDataIterator(this); } = public UIComponent getHeader() { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/UISubTable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UISubTable.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/UISubTable.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -40,18 +40,17 @@ @ResourceDependency(name =3D "subtable.js") public class UISubTable extends UIDataTableBase implements Column, Expanda= ble { = - enum PropertyKeys { - expandMode, expanded, toggleExpression - } - = public static final String MODE_AJAX =3D "ajax"; = = public static final String MODE_SERVER =3D "server"; = public static final String MODE_CLIENT =3D "client"; = + enum PropertyKeys { + expandMode, expanded, toggleExpression + } = - = + = @Override public void broadcast(FacesEvent event) throws AbortProcessingExceptio= n { super.broadcast(event); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/component/html/HtmlColumn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/html/HtmlColumn.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= component/html/HtmlColumn.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -26,14 +26,15 @@ = public class HtmlColumn extends UIColumn { = + public static final String COMPONENT_TYPE =3D "org.richfaces.Column"; + + public static final String COMPONENT_FAMILY =3D "org.richfaces.Column"; + = enum PropertyKeys { breakBefore, rowspan, colspan, selfSorted, sortBy } + = = - public static final String COMPONENT_TYPE =3D "org.richfaces.Column"; - - public static final String COMPONENT_FAMILY =3D "org.richfaces.Column"; - public int getColspan() { return (Integer) getStateHelper().eval(PropertyKeys.colspan, Integ= er.MIN_VALUE); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/AbstractRowsRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/AbstractRowsRenderer.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/AbstractRowsRenderer.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -26,6 +26,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import javax.faces.view.facelets.FaceletException; = import org.ajax4jsf.model.DataVisitResult; import org.ajax4jsf.model.DataVisitor; @@ -37,13 +38,7 @@ * = */ public abstract class AbstractRowsRenderer extends RendererBase implements= DataVisitor { - /* - * public static final String[][] TABLE_EVENT_ATTRS =3D { //TODO nick = - clarify new names for attributes - * {"onclick","onRowClick"}, {"ondblclick","onRowDblClick"}, {"onmouse= move","onRowMouseMove"}, - * {"onmouseup","onRowMouseUp"}, {"onmousedown","onRowMouseDown"}, {"o= nmouseover","onRowMouseOver"}, - * {"onmouseout","onRowMouseOut"} }; - */ - = + public DataVisitResult process(FacesContext context, Object rowKey, Ob= ject argument) { RowHolderBase holder =3D (RowHolderBase) argument; Row row =3D holder.getRow(); @@ -51,7 +46,7 @@ try { encodeRow(holder); } catch (IOException e) { - // TODO: anton - seems we need add throws IOException ??? + throw new FaceletException(e); } holder.nextRow(); return DataVisitResult.CONTINUE; @@ -88,14 +83,5 @@ public boolean getRendersChildren() { return true; } - = = - /* - * protected void encodeRowEvents(FacesContext context, UIDataAdaptor = table) throws IOException { - * = - * RendererUtils utils2 =3D getUtils(); for (int i =3D 0; i < TABLE_EV= ENT_ATTRS.length; i++) { String[] attrs =3D - * TABLE_EVENT_ATTRS[i]; utils2.encodeAttribute(context, table, attrs[= 1], attrs[0]); } - * = - * } - */ } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/AbstractTableRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/AbstractTableRenderer.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/AbstractTableRenderer.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -2,11 +2,9 @@ = import java.io.IOException; import java.util.Iterator; -import java.util.Map; = import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; -import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/ColumnGroupRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/ColumnGroupRenderer.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/ColumnGroupRenderer.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -46,100 +46,85 @@ = return new RowHolder(context, parent.getClientId(context),(UIColum= nGroup)component); } - + = + // ColumnGroup component doesn't have css styles @Override public String getCellSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnFooterCellSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnFooterFirstSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnFooterSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnHeaderCellSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnHeaderFirstSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getColumnHeaderSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getFirstRowSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getFooterCellSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getFooterFirstSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getFooterSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getHeaderCellSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getHeaderFirstSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getHeaderSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getRowSkinClass() { - // TODO Auto-generated method stub return null; } = @Override public String getTableSkinClass() { - // TODO Auto-generated method stub return null; } = Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/HeaderEncodeStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/HeaderEncodeStrategy.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/HeaderEncodeStrategy.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -26,7 +26,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -//TODO - anton move to the api +//TODO: anton - move to the api public interface HeaderEncodeStrategy { = = Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/SubTableRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/SubTableRenderer.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/SubTableRenderer.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -121,7 +121,7 @@ = @Override public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column= , String tableFacetName) { - // TODO implement column header facet + // TODO: implement column header facet return null; = } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/rich= faces/renderkit/ToggleControlRendererBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/ToggleControlRendererBase.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/ToggleControlRendererBase.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -13,10 +13,8 @@ import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.RendererBase; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.component.Expandable; import org.richfaces.component.UISubTable; import org.richfaces.component.UIToggleControl; -import org.richfaces.event.ToggleEvent; = /** * @author Anton Belevich Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richf= aces/renderkit/TogglerBehaviorRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/TogglerBehaviorRenderer.java 2010-04-29 14:11:41 UTC (rev 16844) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/= renderkit/TogglerBehaviorRenderer.java 2010-04-29 15:53:41 UTC (rev 16845) @@ -1,72 +0,0 @@ -package org.richfaces.renderkit; - -import java.util.HashMap; -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.ClientBehavior; -import javax.faces.component.behavior.ClientBehaviorContext; -import javax.faces.context.FacesContext; -import javax.faces.render.ClientBehaviorRenderer; -import javax.faces.render.FacesBehaviorRenderer; -import javax.faces.render.RenderKitFactory; - -import org.ajax4jsf.javascript.JSFunction; -import org.ajax4jsf.renderkit.RendererUtils; -import org.richfaces.component.behavior.ToggleBehavior; - -(a)FacesBehaviorRenderer(rendererType=3D"org.richfaces.behavior.ToggleBeha= vior", renderKitId=3DRenderKitFactory.HTML_BASIC_RENDER_KIT) -public class TogglerBehaviorRenderer extends ClientBehaviorRenderer { - = - private String SCRIPT_NAME =3D "RichFaces.Event.callHandlerById"; - = - private String SCRIPT_EMPTY =3D ""; - = -// RichFaces.Event.callHandlerById('form1:j_idt6', 'RICH:sort', {state:= 'expanded'}); - @Override - public String getScript(ClientBehaviorContext behaviorContext, ClientB= ehavior behavior) { - = - String script =3D SCRIPT_EMPTY; = - = - if(behavior instanceof ToggleBehavior) { - = - ToggleBehavior toggleBehavior =3D (ToggleBehavior)behavior; - = - UIComponent toggleComponent =3D findComponent(behaviorContext,= toggleBehavior.getToggleComponentId()); - UIComponent toggleSource =3D findComponent(behaviorContext, to= ggleBehavior.getToggleSource()); - = - = - String toggleComponentId =3D toggleComponent.getClientId(behav= iorContext.getFacesContext()); - String toggleSourceId =3D toggleSource.getClientId(behaviorCon= text.getFacesContext()); - = - String toggleEventType =3D toggleBehavior.getToggleEvent(); = - = - JSFunction function =3D new JSFunction(SCRIPT_NAME); - function.addParameter(toggleComponentId); - function.addParameter(toggleEventType); - = - Map data =3D new HashMap(); = - function.addParameter(data); - data.put("source", toggleSourceId); - = - function.appendScript(new StringBuffer()); - script =3D function.toScript(); = - } - = - return script; - } - = - private UIComponent findComponent(ClientBehaviorContext behaviorContex= t, String id) { - UIComponent component =3D behaviorContext.getComponent(); - //TODO: anton - check id =3D=3D null!!! - //TODO: anton - should found component implement marker interface= e.g. ToggleAble ??? = - return RendererUtils.getInstance().findComponentFor(component, id); - } - = - @Override - public void decode(FacesContext context, UIComponent component, Client= Behavior behavior) { - super.decode(context, component, behavior); - } - = - -} --===============7336843531636131546==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 11:54:40 2010 Content-Type: multipart/mixed; boundary="===============5423732499788952984==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16846 - root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/component. Date: Thu, 29 Apr 2010 11:54:40 -0400 Message-ID: <201004291554.o3TFseZv028380@svn01.web.mwc.hst.phx2.redhat.com> --===============5423732499788952984== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abelevich Date: 2010-04-29 11:54:40 -0400 (Thu, 29 Apr 2010) New Revision: 16846 Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/c= omponent/IteratorBaseTest.java root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/c= omponent/UIDataTableBaseTest.java Log: refactoring Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/rich= faces/component/IteratorBaseTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/= component/IteratorBaseTest.java 2010-04-29 15:53:41 UTC (rev 16845) +++ root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/= component/IteratorBaseTest.java 2010-04-29 15:54:40 UTC (rev 16846) @@ -42,7 +42,7 @@ = private static final List strings =3D Collections.unmodifiableLis= t(Arrays.asList("a", "b", "c")); = - private static class IteratorImpl extends IteratorBase { + private static class IteratorImpl extends DataTableIteratorBase { = private Iterator iterator; = Modified: root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/rich= faces/component/UIDataTableBaseTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/= component/UIDataTableBaseTest.java 2010-04-29 15:53:41 UTC (rev 16845) +++ root/ui-sandbox/trunk/components/tables/ui/src/test/java/org/richfaces/= component/UIDataTableBaseTest.java 2010-04-29 15:54:40 UTC (rev 16846) @@ -146,7 +146,7 @@ */ @Test public void testDataChildren() { - Assert.assertTrue(table.dataChildren() instanceof DataIterator); + Assert.assertTrue(table.dataChildren() instanceof DataTableDataIte= rator); } = /** @@ -154,7 +154,7 @@ */ @Test public void testFixedChildren() { - Assert.assertTrue(table.fixedChildren() instanceof FixedChildrenIt= erator); + Assert.assertTrue(table.fixedChildren() instanceof DataTableFixedC= hildrenIterator); } = /** @@ -202,7 +202,7 @@ */ @Test public void testColumns() { - Assert.assertTrue(table.columns() instanceof ColumnsIterator); + Assert.assertTrue(table.columns() instanceof DataTableColumnsItera= tor); } = /** --===============5423732499788952984==-- From richfaces-svn-commits at lists.jboss.org Thu Apr 29 13:16:50 2010 Content-Type: multipart/mixed; boundary="===============9037044565779464551==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r16847 - in branches/enterprise/3.3.X/framework: api/src/main/java/org/ajax4jsf/javascript and 2 other directories. Date: Thu, 29 Apr 2010 13:16:50 -0400 Message-ID: <201004291716.o3THGo6b017909@svn01.web.mwc.hst.phx2.redhat.com> --===============9037044565779464551== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nbelaevski Date: 2010-04-29 13:16:49 -0400 (Thu, 29 Apr 2010) New Revision: 16847 Modified: branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/Messa= ges.java branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/javas= cript/ScriptUtils.java branches/enterprise/3.3.X/framework/api/src/test/java/org/ajax4jsf/frame= work/util/javascript/ScriptUtilsTest.java branches/enterprise/3.3.X/framework/impl/src/main/resources/org/ajax4jsf= /messages.properties Log: https://jira.jboss.org/jira/browse/RFPL-540 Modified: branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4js= f/Messages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/Mess= ages.java 2010-04-29 15:54:40 UTC (rev 16846) +++ branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/Mess= ages.java 2010-04-29 17:16:49 UTC (rev 16847) @@ -365,7 +365,8 @@ public static final String DATASCROLLER_PAGE_MISSING =3D "DATASCROLLER_PA= GE_MISSING"; public static final String DATASCROLLER_PAGES_DIFFERENT =3D "DATASCROLLER= _PAGES_DIFFERENT"; public static final String COMPONENT_CONVERSION_ERROR =3D "COMPONENT_CONV= ERSION_ERROR"; - + public static final String JAVASCRIPT_CIRCULAR_REFERENCE =3D "JAVASCRIPT_= CIRCULAR_REFERENCE"; + = public static void main(String[] args) { String m =3D getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); System.out.println(m); Modified: branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4js= f/javascript/ScriptUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/java= script/ScriptUtils.java 2010-04-29 15:54:40 UTC (rev 16846) +++ branches/enterprise/3.3.X/framework/api/src/main/java/org/ajax4jsf/java= script/ScriptUtils.java 2010-04-29 17:16:49 UTC (rev 16847) @@ -24,13 +24,19 @@ import java.beans.PropertyDescriptor; import java.io.UnsupportedEncodingException; import java.lang.reflect.Array; +import java.text.MessageFormat; import java.util.Collection; +import java.util.IdentityHashMap; import java.util.Iterator; import java.util.Map; +import java.util.MissingResourceException; = import javax.faces.FacesException; = +import org.ajax4jsf.Messages; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; = /** * @author shura (latest modification by $Author: alexsmirnov $) @@ -39,6 +45,8 @@ */ public class ScriptUtils { = + private static final Log LOG =3D LogFactory.getLog(ScriptUtils.class); + = /** * This is utility class, don't instantiate. */ @@ -52,10 +60,31 @@ * @return */ public static String toScript(Object obj) { - if (null =3D=3D obj) { - return "null"; + Map cycleBusterMap =3D new IdentityHashMap(); + return toScript(obj, cycleBusterMap); + } + + private static String toScript(Object obj, Map cycleBust= erMap) { + String result; + Boolean cycleBusterValue =3D cycleBusterMap.put(obj, Boolean.TRUE); + + if (cycleBusterValue !=3D null) { + if (LOG.isDebugEnabled()) { + String formattedMessage; + try { + formattedMessage =3D Messages.getMessage(Messages.JAVASCR= IPT_CIRCULAR_REFERENCE, obj); + } catch (MissingResourceException e) { + //ignore exception: workaround for unit tests + formattedMessage =3D MessageFormat.format("Circular referenc= e serializing object to JS: {0}", obj); + } + = + LOG.debug(formattedMessage); + } + result =3D "null"; + } else if (null =3D=3D obj) { + result =3D "null"; } else if (obj instanceof ScriptString) { - return ((ScriptString) obj).toScript(); + result =3D ((ScriptString) obj).toScript(); } else if (obj.getClass().isArray()) { StringBuilder ret =3D new StringBuilder("["); boolean first =3D true; @@ -64,11 +93,11 @@ if (!first) { ret.append(','); } - ret.append(toScript(element)); + ret.append(toScript(element, cycleBusterMap)); first =3D false; } - return ret.append("] ").toString(); - } else if (obj instanceof Collection) { + result =3D ret.append("] ").toString(); + } else if (obj instanceof Collection) { // Collections put as JavaScript array. = @SuppressWarnings("unchecked") @@ -81,11 +110,11 @@ if (!first) { ret.append(','); } - ret.append(toScript(element)); + ret.append(toScript(element, cycleBusterMap)); first =3D false; } - return ret.append("] ").toString(); - } else if (obj instanceof Map) { + result =3D ret.append("] ").toString(); + } else if (obj instanceof Map) { = // Maps put as JavaScript hash. @SuppressWarnings("unchecked") @@ -100,23 +129,23 @@ = addEncodedString(ret, entry.getKey()); ret.append(":"); - ret.append(toScript(entry.getValue())); + ret.append(toScript(entry.getValue(), cycleBusterMap)); first =3D false; } - return ret.append("} ").toString(); + result =3D ret.append("} ").toString(); } else if (obj instanceof Number || obj instanceof Boolean) { // numbers and boolean put as-is, without conversion - return obj.toString(); + result =3D obj.toString(); } else if (obj instanceof String) { // all other put as encoded strings. StringBuilder ret =3D new StringBuilder(); addEncodedString(ret, obj); - return ret.toString(); - } else if (obj instanceof Enum) { + result =3D ret.toString(); + } else if (obj instanceof Enum) { // all other put as encoded strings. StringBuilder ret =3D new StringBuilder(); addEncodedString(ret, obj); - return ret.toString(); + result =3D ret.toString(); } else if (obj.getClass().getName().startsWith("java.sql.")) { StringBuilder ret =3D new StringBuilder("{"); boolean first =3D true; @@ -139,37 +168,43 @@ = addEncodedString(ret, key); ret.append(":"); - ret.append(toScript(value)); + ret.append(toScript(value, cycleBusterMap)); = first =3D false; } - return ret.append("} ").toString(); - } - - // All other objects threaded as Java Beans. - try { - StringBuilder ret =3D new StringBuilder("{"); - PropertyDescriptor[] propertyDescriptors =3D PropertyUtils - .getPropertyDescriptors(obj); - boolean first =3D true; - for (PropertyDescriptor propertyDescriptor : propertyDescripto= rs) { - String key =3D propertyDescriptor.getName(); - if ("class".equals(key)) { - continue; + result =3D ret.append("} ").toString(); + } else { + // All other objects threaded as Java Beans. + try { + StringBuilder ret =3D new StringBuilder("{"); + PropertyDescriptor[] propertyDescriptors =3D PropertyUtils + .getPropertyDescriptors(obj); + boolean first =3D true; + for (PropertyDescriptor propertyDescriptor : propertyDescr= iptors) { + String key =3D propertyDescriptor.getName(); + if ("class".equals(key)) { + continue; + } + if (!first) { + ret.append(','); + } + addEncodedString(ret, key); + ret.append(":"); + ret.append(toScript(PropertyUtils.getProperty(obj, key= ), cycleBusterMap)); + first =3D false; } - if (!first) { - ret.append(','); - } - addEncodedString(ret, key); - ret.append(":"); - ret.append(toScript(PropertyUtils.getProperty(obj, key))); - first =3D false; + result =3D ret.append("} ").toString(); + } catch (Exception e) { + throw new FacesException( + "Error in conversion Java Object to JavaScript", e= ); } - return ret.append("} ").toString(); - } catch (Exception e) { - throw new FacesException( - "Error in conversion Java Object to JavaScript", e); } + = + if (cycleBusterValue =3D=3D null) { + cycleBusterMap.remove(obj); + } + = + return result; } = public static void addEncodedString(StringBuilder buff, Object obj) { Modified: branches/enterprise/3.3.X/framework/api/src/test/java/org/ajax4js= f/framework/util/javascript/ScriptUtilsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.X/framework/api/src/test/java/org/ajax4jsf/fram= ework/util/javascript/ScriptUtilsTest.java 2010-04-29 15:54:40 UTC (rev 168= 46) +++ branches/enterprise/3.3.X/framework/api/src/test/java/org/ajax4jsf/fram= ework/util/javascript/ScriptUtilsTest.java 2010-04-29 17:16:49 UTC (rev 168= 47) @@ -23,34 +23,37 @@ = import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; = +import junit.framework.TestCase; + import org.ajax4jsf.javascript.ScriptUtils; = -import junit.framework.TestCase; - /** * @author shura - * + * = */ public class ScriptUtilsTest extends TestCase { = /** * @author shura - * + * = */ public static class Bean { - = + int _integer; boolean _bool; Object _foo; - = + public Bean() { } + /** * @param ineger * @param bool @@ -61,44 +64,103 @@ this._bool =3D bool; this._foo =3D foo; } + /** * @return the bool */ public boolean isBool() { return this._bool; } + /** - * @param bool the bool to set + * @param bool + * the bool to set */ public void setBool(boolean bool) { this._bool =3D bool; } + /** * @return the ineger */ public int getInteger() { return this._integer; } + /** - * @param ineger the ineger to set + * @param ineger + * the ineger to set */ public void setInteger(int ineger) { this._integer =3D ineger; } + /** * @return the foo */ public Object getFoo() { return this._foo; } + /** - * @param foo the foo to set + * @param foo + * the foo to set */ public void setFoo(Object foo) { this._foo =3D foo; } } = + public static class ReferencedBean { + + private String name; + + private ReferenceHolderBean parent; + + public ReferencedBean(String name, ReferenceHolderBean parent) { + super(); + this.name =3D name; + this.parent =3D parent; + } + + public ReferenceHolderBean getParent() { + return parent; + } + + public String getName() { + return name; + } + } + + public static class ReferenceHolderBean { + + private String name; + + private Object reference; + + public ReferenceHolderBean(String name) { + super(); + this.name =3D name; + } + + public String getName() { + return name; + } + + public Object getReference() { + return reference; + } + + public void setReference(Object reference) { + this.reference =3D reference; + } + + } + + private static String dehydrate(String s) { + return s !=3D null ? s.replaceAll("\\s", "") : s; + } + /** * @param name */ @@ -107,7 +169,8 @@ } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testStringToScript() { Object obj =3D "foo"; @@ -115,42 +178,49 @@ } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testArrayToScript() { - int[] obj =3D {1,2,3,4,5}; + int[] obj =3D { 1, 2, 3, 4, 5 }; assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } = public void testSqlDate() { - java.sql.Time obj =3D new java.sql.Time(1); - assertNotNull(ScriptUtils.toScript(obj)); + java.sql.Time obj =3D new java.sql.Time(1); + assertNotNull(ScriptUtils.toScript(obj)); = - java.sql.Date obj1 =3D new java.sql.Date(1); - assertNotNull(ScriptUtils.toScript(obj1)); + java.sql.Date obj1 =3D new java.sql.Date(1); + assertNotNull(ScriptUtils.toScript(obj1)); } - = + /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalArrayToScript() { - int[][] obj =3D {{1,2},{3,4}}; + int[][] obj =3D { { 1, 2 }, { 3, 4 } }; assertEquals("[[1,2] ,[3,4] ] ", ScriptUtils.toScript(obj)); } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testTwoDimentionalStringArrayToScript() { - String[][] obj =3D {{"one","two"},{"three","four"}}; - assertEquals("[['one','two'] ,['three','four'] ] ", ScriptUtils.toScript= (obj)); + String[][] obj =3D { { "one", "two" }, { "three", "four" } }; + assertEquals("[['one','two'] ,['three','four'] ] ", ScriptUtils + .toScript(obj)); Map map =3D new TreeMap(); map.put("a", obj); map.put("b", "c"); - assertEquals("{'a':[['one','two'] ,['three','four'] ] ,'b':'c'} ", Scrip= tUtils.toScript(map)); + assertEquals("{'a':[['one','two'] ,['three','four'] ] ,'b':'c'} ", + ScriptUtils.toScript(map)); } + /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testListToScript() { List obj =3D new ArrayList(); @@ -163,7 +233,8 @@ } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testSetToScript() { Set obj =3D new TreeSet(); @@ -174,35 +245,47 @@ obj.add(new Integer(5)); assertEquals("[1,2,3,4,5] ", ScriptUtils.toScript(obj)); } + /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectArrayToScript() { - Bean[] obj =3D {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; - assertEquals("[{'bool':true,'foo':'foo',\'integer\':1} ,{'bool':false,'f= oo':'bar','integer':2} ] ", ScriptUtils.toScript(obj)); + Bean[] obj =3D { new Bean(1, true, "foo"), new Bean(2, false, "bar") }; + assertEquals( + "[{'bool':true,'foo':'foo',\'integer\':1} ,{'bool':false,'foo':'bar','= integer':2} ] ", + ScriptUtils.toScript(obj)); } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testObjectListToScript() { - Bean[] array =3D {new Bean(1,true,"foo"),new Bean(2,false,"bar")}; + Bean[] array =3D { new Bean(1, true, "foo"), new Bean(2, false, "bar") }; List obj =3D Arrays.asList(array); - assertEquals("[{'bool':true,'foo':'foo',\'integer\':1} ,{'bool':false,'f= oo':'bar','integer':2} ] ", ScriptUtils.toScript(obj)); + assertEquals( + "[{'bool':true,'foo':'foo',\'integer\':1} ,{'bool':false,'foo':'bar','= integer':2} ] ", + ScriptUtils.toScript(obj)); } - = + /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#toScript(ja= va.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#toScript(java.lang.Object)}. */ public void testMapToScript() { TreeMap obj =3D new TreeMap(); obj.put("a", "foo"); obj.put("b", "bar"); obj.put("c", "baz"); - assertEquals("{'a':'foo','b':'bar','c':'baz'} ", ScriptUtils.toScript(ob= j)); + assertEquals("{'a':'foo','b':'bar','c':'baz'} ", ScriptUtils + .toScript(obj)); } + /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncodedS= tring(java.lang.StringBuffer, java.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#addEncodedString(java.lang.= StringBuffer, java.lang.Object)} + * . */ public void testAddEncodedString() { StringBuilder buff =3D new StringBuilder(); @@ -211,7 +294,9 @@ } = /** - * Test method for {@link org.ajax4jsf.javascript.ScriptUtils#addEncoded(= java.lang.StringBuffer, java.lang.Object)}. + * Test method for + * {@link org.ajax4jsf.javascript.ScriptUtils#addEncoded(java.lang.String= Buffer, java.lang.Object)} + * . */ public void testAddEncoded() { StringBuilder buff =3D new StringBuilder(); @@ -219,5 +304,55 @@ assertEquals("foo\\\"\\\'", buff.toString()); } = + public void testCircularReferenceBeans() throws Exception { + ReferenceHolderBean parent =3D new ReferenceHolderBean("parent"); + ReferencedBean child =3D new ReferencedBean("child", parent); + = + assertEquals(dehydrate("{'name': 'child', 'parent': {'name': 'parent', '= reference': null}}"), + dehydrate(ScriptUtils.toScript(child))); + } + + public void testCircularReferenceViaProperty() throws Exception { + ReferenceHolderBean parent =3D new ReferenceHolderBean("parent"); + ReferencedBean child =3D new ReferencedBean("child", parent); + + parent.setReference(child); + + assertEquals(dehydrate("{'name': 'parent', 'reference': {'name': 'child'= , 'parent': null}}"), + dehydrate(ScriptUtils.toScript(parent))); + } = + public void testCircularReferenceViaArray() throws Exception { + ReferenceHolderBean parent =3D new ReferenceHolderBean("parent"); + ReferencedBean child =3D new ReferencedBean("child", parent); + + parent.setReference(new Object[] {child}); + + assertEquals(dehydrate("{'name': 'parent', 'reference': [{'name': 'child= ', 'parent': null}]}"), + dehydrate(ScriptUtils.toScript(parent))); + } = + + public void testCircularReferenceViaCollection() throws Exception { + ReferenceHolderBean parent =3D new ReferenceHolderBean("parent"); + ReferencedBean child =3D new ReferencedBean("child", parent); + + Collection