March 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r6728 - in trunk: framework/impl and 9 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-03-11 20:07:21 -0400 (Tue, 11 Mar 2008) New Revision: 6728 Added: trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextTest.java trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java trunk/framework/test/src/test/resources/META-INF/ajaxContext.txt Removed: trunk/framework/impl/src/main/javascript/prototype/HEADER trunk/framework/impl/src/main/javascript/prototype/ajax.js trunk/framework/impl/src/main/javascript/prototype/array.js trunk/framework/impl/src/main/javascript/prototype/base.js trunk/framework/impl/src/main/javascript/prototype/compat.js trunk/framework/impl/src/main/javascript/prototype/dom.js trunk/framework/impl/src/main/javascript/prototype/empty.js trunk/framework/impl/src/main/javascript/prototype/enumerable.js trunk/framework/impl/src/main/javascript/prototype/epilog.js trunk/framework/impl/src/main/javascript/prototype/event.js trunk/framework/impl/src/main/javascript/prototype/form.js trunk/framework/impl/src/main/javascript/prototype/hash.js trunk/framework/impl/src/main/javascript/prototype/position.js trunk/framework/impl/src/main/javascript/prototype/prolog.js trunk/framework/impl/src/main/javascript/prototype/prototype.js trunk/framework/impl/src/main/javascript/prototype/range.js trunk/framework/impl/src/main/javascript/prototype/string.js Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java trunk/framework/impl/generatescript.xml trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneOneInvoker.java trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneTwoInvoker.java trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java Log: Continue to refactor JSF 1.2 compatibility. Remove old versions prototype files Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -25,8 +25,6 @@ public abstract String getAjaxActionURL(FacesContext context); - public abstract String getAjaxActionURL(); - public abstract void setResponseData(Object responseData); public abstract Object getResponseData(); @@ -53,8 +51,6 @@ public abstract Set<String> getAjaxAreasToRender(); - public abstract boolean isAjaxRequest(FacesContext context); - public abstract boolean isAjaxRequest(); public abstract void processHeadResources(FacesContext context) @@ -79,7 +75,7 @@ public static final String STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_STYLES"; public static final String USER_STYLES_PARAMETER = "org.ajax4jsf.framework.HEADER_USER_STYLES"; public static final String RESPONSE_DATA_KEY = "_ajax:data"; - private static final String SERVICE_RESOURCE = "META-INF/services/" + static final String SERVICE_RESOURCE = "META-INF/services/" + AjaxContext.class.getName(); private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl"; @@ -94,7 +90,7 @@ return getCurrentInstance(context); } - private static Map<ClassLoader, Class<AjaxContext>> ajaxContextClasses = new HashMap<ClassLoader, Class<AjaxContext>>(); + private static Map<ClassLoader, Class<? extends AjaxContext>> ajaxContextClasses = new HashMap<ClassLoader, Class<? extends AjaxContext>>(); /** * Get instance of current AJAX Context. Instance get by @@ -104,7 +100,6 @@ * current FacesContext * @return instance of AjaxContext. */ - @SuppressWarnings("unchecked") public static AjaxContext getCurrentInstance(FacesContext context) { if (null == context) { throw new NullPointerException("FacesContext is null"); @@ -114,11 +109,12 @@ AjaxContext ajaxContext = (AjaxContext) requestMap .get(AJAX_CONTEXT_KEY); if (null == ajaxContext) { - // TODO Create default implementation. - // ajaxContext = new AjaxContext(); ClassLoader contextClassLoader = Thread.currentThread() .getContextClassLoader(); - Class<AjaxContext> clazz; + if(null == contextClassLoader) { + contextClassLoader = AjaxContext.class.getClassLoader(); + } + Class<? extends AjaxContext> clazz; synchronized (ajaxContextClasses) { clazz = ajaxContextClasses.get(contextClassLoader); if (null == clazz) { @@ -146,19 +142,18 @@ } } try { - clazz = (Class<AjaxContext>) Class.forName( - factoryClassName, false, contextClassLoader); + clazz = Class.forName(factoryClassName, false, contextClassLoader).asSubclass(AjaxContext.class); } catch (ClassNotFoundException e) { throw new FacesException( "AjaxContext implementation class " + factoryClassName + " not found ", e); } ajaxContextClasses.put(contextClassLoader, clazz); - } } try { - ajaxContext = clazz.newInstance(); + ajaxContext = clazz.newInstance(); + ajaxContext.decode(context); } catch (InstantiationException e) { throw new FacesException( "Error to create AjaxContext Instance", e); @@ -172,8 +167,9 @@ } public AjaxContext() { - super(); } + + public abstract void decode(FacesContext context); public abstract void release(); @@ -185,7 +181,11 @@ public abstract void setSelfRender(boolean b); - public abstract String getSubmittedRegionClientId(FacesContext context); + public abstract String getSubmittedRegionClientId(); public abstract void saveViewState(FacesContext context) throws IOException; + + public abstract void setAjaxSingleClientId(String ajaxSingleClientId); + + public abstract String getAjaxSingleClientId(); } \ No newline at end of file Modified: trunk/framework/impl/generatescript.xml =================================================================== --- trunk/framework/impl/generatescript.xml 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/generatescript.xml 2008-03-12 00:07:21 UTC (rev 6728) @@ -64,10 +64,6 @@ files="prototype1.6.0.js,../memory.js,patches.js"> </filelist> - <filelist id="prototype.extend" - dir="${basedir}/src/main/javascript/prototype" - files="dom.js,form.js,event.js,position.js,../memory.js,patches.js"> - </filelist> <filelist id="dnd" dir="${basedir}/src/main/javascript/dnd" Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -334,7 +334,7 @@ */ protected Object getLogicalViewId(FacesContext context) { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - if (ajaxContext.isAjaxRequest(context)) { + if (ajaxContext.isAjaxRequest()) { Object id = context.getExternalContext().getRequestMap().get( VIEW_SEQUENCE); if (null != id) { Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -128,7 +128,7 @@ */ public void writeState(FacesContext context) throws IOException { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - if (ajaxContext.isAjaxRequest(context)) { + if (ajaxContext.isAjaxRequest()) { // TODO - detect case of JSF 1.1 + JSP. for all other we need own // state marker for // self-rendered regions only. @@ -207,14 +207,14 @@ AjaxViewRoot ajaxRoot = (AjaxViewRoot) root; Map requestMap = context.getExternalContext().getRequestMap(); // broadcast ajax events before render response. - if (ajaxContext.isAjaxRequest(context) + if (ajaxContext.isAjaxRequest() && null == requestMap .get(AjaxRendererUtils.AJAX_AREAS_RENDERED)) { processAjaxEvents(context, ajaxRoot); } if (!context.getResponseComplete()) { super.renderView(context, root); - if (ajaxContext.isAjaxRequest(context) + if (ajaxContext.isAjaxRequest() && null == requestMap .get(AjaxRendererUtils.AJAX_AREAS_RENDERED)) { // HACK for MyFaces ( <f:view> tag not call renderers ) Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -381,8 +381,7 @@ */ public void encodeChildren(FacesContext context) throws IOException { if (!isHavePage() - && AjaxContext.getCurrentInstance(context).isAjaxRequest( - context)) { + && AjaxContext.getCurrentInstance(context).isAjaxRequest()) { AjaxContextImpl.invokeOnRegionOrRoot(this, context, _ajaxInvoker); } else { super.encodeChildren(context); @@ -510,7 +509,7 @@ public boolean getRendersChildren() { FacesContext context = FacesContext.getCurrentInstance(); // For non Ajax request, view root not render children - if (!AjaxContext.getCurrentInstance(context).isAjaxRequest(context)) { + if (!AjaxContext.getCurrentInstance(context).isAjaxRequest()) { return false; } // Also, if have page component as clild - delegate rendering of Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -51,8 +51,11 @@ import javax.faces.event.AbortProcessingException; import javax.faces.render.RenderKit; import javax.faces.render.RenderKitFactory; +import javax.servlet.Servlet; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; import org.ajax4jsf.Messages; import org.ajax4jsf.application.AjaxViewHandler; @@ -83,6 +86,8 @@ @SuppressWarnings("deprecation") public class AjaxContextImpl extends AjaxContext { + public static final String SERVLET_ERROR_EXCEPTION_ATTRIBUTE = "javax.servlet.error.exception"; + public static final String RESOURCES_PROCESSED = "org.ajax4jsf.framework.HEADER_PROCESSED"; //we do not apply extended CSS styling for control for Opera & Safari @@ -98,8 +103,6 @@ private static ComponentInvoker invoker; - //TODO: what is it? - private static Map contextClasses = new HashMap(); Set<String> ajaxAreasToRender = new HashSet<String>(); @@ -107,15 +110,14 @@ boolean ajaxRequest = false; - boolean ajaxRequestSet = false; - boolean selfRender = false; Integer viewSequence = new Integer(1); String submittedRegionClientId = null; + + String ajaxSingleClientId = null; - boolean submittedRegionSet = false; ViewIdHolder viewIdHolder = null; @@ -142,16 +144,12 @@ ajaxRequest = false; - ajaxRequestSet = false; - selfRender = false; viewSequence = new Integer(1); submittedRegionClientId = null; - submittedRegionSet = false; - viewIdHolder = null; responseDataMap = new HashMap<String, Object>(); @@ -160,6 +158,29 @@ } + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#decode(javax.faces.context.FacesContext) + */ + @Override + public void decode(FacesContext context) { + ExternalContext externalContext = context.getExternalContext(); + if (null == externalContext.getRequestMap().get( + SERVLET_ERROR_EXCEPTION_ATTRIBUTE)) { + Map<String, String> requestParameterMap = externalContext + .getRequestParameterMap(); + String ajaxRegionId = requestParameterMap + .get(AjaxContainerRenderer.AJAX_PARAMETER_NAME); + setSubmittedRegionClientId(ajaxRegionId); + setAjaxRequest(null != ajaxRegionId); + setAjaxSingleClientId(requestParameterMap.get(AjaxRendererUtils.AJAX_SINGLE_PARAMETER_NAME)); + } else { + // Error page is always serviced as non-ajax. + setAjaxRequest(false); + setSubmittedRegionClientId(null); + setAjaxSingleClientId(null); + } + } + /** * @param root * @param context @@ -188,24 +209,6 @@ invoker.invokeOnRegionOrRoot(viewRoot, context, callback); } - private InvokerCallback _ajaxInvoker = new InvokerCallback() { - - public void invokeContextCallback(FacesContext context, UIComponent component) { - if (component instanceof AjaxContainer) { - AjaxContainer ajax = (AjaxContainer) component; - renderAjaxRegion(context, component, true); - } else { - // Container not found, use Root for encode. - renderAjaxRegion(context, context.getViewRoot(), true); - } - } - - public void invokeRoot(FacesContext context) { - renderAjaxRegion(context, context.getViewRoot(), true); - } - - }; - public void renderSubmittedAjaxRegion(FacesContext context) { renderSubmittedAjaxRegion(context, true); } @@ -231,7 +234,7 @@ }; if (!invokeOnComponent(context.getViewRoot(), context, ajaxInvoker, - getSubmittedRegionClientId(context))) { + getSubmittedRegionClientId())) { renderAjaxRegion(context, context.getViewRoot(), useFilterWriter); } @@ -616,17 +619,6 @@ * @return Returns the ajaxRequest. */ public boolean isAjaxRequest() { - return isAjaxRequest(FacesContext.getCurrentInstance()); - } - - /** - * @return Returns the ajaxRequest. - */ - public boolean isAjaxRequest(FacesContext context) { - if (!this.ajaxRequestSet) { - ajaxRequest = null != getSubmittedRegionClientId(context); - ajaxRequestSet = true; - } return ajaxRequest; } @@ -636,7 +628,6 @@ */ public void setAjaxRequest(boolean ajaxRequest) { this.ajaxRequest = ajaxRequest; - this.ajaxRequestSet = true; } /** @@ -722,25 +713,7 @@ /** * @return Returns the submittedClientId. */ - public String getSubmittedRegionClientId(FacesContext context) { - if (!this.submittedRegionSet) { - ExternalContext externalContext = context.getExternalContext(); - if (null == externalContext.getRequestMap().get( - "javax.servlet.error.exception")) { - Map<String, String> requestParameterMap = externalContext - .getRequestParameterMap(); - this.submittedRegionClientId = (String) requestParameterMap - .get(AjaxContainerRenderer.AJAX_PARAMETER_NAME); - - } else { - // Error page, always parsed as non-ajax request. - this.submittedRegionClientId = null; - } - this.submittedRegionSet = true; - if (!this.ajaxRequestSet) { - setAjaxRequest(this.submittedRegionClientId != null); - } - } + public String getSubmittedRegionClientId() { return this.submittedRegionClientId; } @@ -750,10 +723,25 @@ */ public void setSubmittedRegionClientId(String submittedClientId) { this.submittedRegionClientId = submittedClientId; - this.submittedRegionSet = true; } /** + * @return the ajaxSingleClientId + */ + @Override + public String getAjaxSingleClientId() { + return ajaxSingleClientId; + } + + /** + * @param ajaxSingleClientId the ajaxSingleClientId to set + */ + @Override + public void setAjaxSingleClientId(String ajaxSingleClientId) { + this.ajaxSingleClientId = ajaxSingleClientId; + } + + /** * @return Returns the selfRender. */ public boolean isSelfRender() { @@ -828,9 +816,6 @@ return writer; } - public String getAjaxActionURL() { - return getAjaxActionURL(FacesContext.getCurrentInstance()); - } public String getAjaxActionURL(FacesContext context) { // Check arguments @@ -863,7 +848,7 @@ /** * @return the commonAjaxParameters */ - public Map getCommonAjaxParameters() { + public Map<String, Object> getCommonAjaxParameters() { return commonAjaxParameters; } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneOneInvoker.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneOneInvoker.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneOneInvoker.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -50,7 +50,7 @@ */ public void invokeOnRegionOrRoot(AjaxViewRoot viewRoot, FacesContext context, InvokerCallback callback) { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - String submittedRegionClientId = ajaxContext.getSubmittedRegionClientId(context); + String submittedRegionClientId = ajaxContext.getSubmittedRegionClientId(); if(null == submittedRegionClientId || viewRoot.getId().equals(submittedRegionClientId)){ // This is a not AJAX request, or active region is root. callback.invokeRoot(context); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneTwoInvoker.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneTwoInvoker.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/JsfOneTwoInvoker.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -44,7 +44,7 @@ */ public void invokeOnRegionOrRoot(AjaxViewRoot viewRoot, FacesContext context, InvokerCallback callback) { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); - String submittedRegionClientId = ajaxContext.getSubmittedRegionClientId(context); + String submittedRegionClientId = ajaxContext.getSubmittedRegionClientId(); if(null == submittedRegionClientId || viewRoot.getClientId(context).equals(submittedRegionClientId)){ // This is a not AJAX request, or active region is root. callback.invokeRoot(context); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -118,6 +118,8 @@ public static final String AJAX_ABORT_ATTR = "ignoreDupResponses"; + public static final String AJAX_SINGLE_PARAMETER_NAME = "ajaxSingle"; + /** * Static class - protect constructor TODO - make as subclass of chameleon * RendererUtils. @@ -216,7 +218,7 @@ // For input components in single mode or without form submit input // control ) if (ajaxSingle ) { - parameters.put(AJAX_SINGLE_ATTR, targetComponent.getClientId(facesContext)); + parameters.put(AJAX_SINGLE_PARAMETER_NAME, targetComponent.getClientId(facesContext)); // options.put("single", JSReference.TRUE); if (input) { options.put("control", JSReference.THIS); @@ -896,7 +898,7 @@ */ public static boolean isAjaxRequest(FacesContext facesContext) { - return AjaxContext.getCurrentInstance(facesContext).isAjaxRequest(facesContext); + return AjaxContext.getCurrentInstance(facesContext).isAjaxRequest(); } /** Deleted: trunk/framework/impl/src/main/javascript/prototype/HEADER =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/HEADER 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/HEADER 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,21 +0,0 @@ -/* Prototype JavaScript framework, version <%= PROTOTYPE_VERSION %> - - * (c) 2005 Sam Stephenson <sam(a)conio.net> - - * - - * THIS FILE IS AUTOMATICALLY GENERATED. When sending patches, please diff - - * against the source tree, available from the Prototype darcs repository. - - * - - * Prototype is freely distributable under the terms of an MIT-style license. - - * - - * For details, see the Prototype web site: http://prototype.conio.net/ - - * - -/*--------------------------------------------------------------------------*/ \ No newline at end of file Deleted: trunk/framework/impl/src/main/javascript/prototype/ajax.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/ajax.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/ajax.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,285 +0,0 @@ -var Ajax = { - getTransport: function() { - return Try.these( - function() {return new ActiveXObject('Msxml2.XMLHTTP')}, - function() {return new ActiveXObject('Microsoft.XMLHTTP')}, - function() {return new XMLHttpRequest()} - ) || false; - }, - - activeRequestCount: 0 -} - -Ajax.Responders = { - responders: [], - - _each: function(iterator) { - this.responders._each(iterator); - }, - - register: function(responderToAdd) { - if (!this.include(responderToAdd)) - this.responders.push(responderToAdd); - }, - - unregister: function(responderToRemove) { - this.responders = this.responders.without(responderToRemove); - }, - - dispatch: function(callback, request, transport, json) { - this.each(function(responder) { - if (responder[callback] && typeof responder[callback] == 'function') { - try { - responder[callback].apply(responder, [request, transport, json]); - } catch (e) {} - } - }); - } -}; - -Object.extend(Ajax.Responders, Enumerable); - -Ajax.Responders.register({ - onCreate: function() { - Ajax.activeRequestCount++; - }, - - onComplete: function() { - Ajax.activeRequestCount--; - } -}); - -Ajax.Base = function() {}; -Ajax.Base.prototype = { - setOptions: function(options) { - this.options = { - method: 'post', - asynchronous: true, - parameters: '' - } - Object.extend(this.options, options || {}); - }, - - responseIsSuccess: function() { - return this.transport.status == undefined - || this.transport.status == 0 - || (this.transport.status >= 200 && this.transport.status < 300); - }, - - responseIsFailure: function() { - return !this.responseIsSuccess(); - } -} - -Ajax.Request = Class.create(); -Ajax.Request.Events = - ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; - -Ajax.Request.prototype = Object.extend(new Ajax.Base(), { - initialize: function(url, options) { - this.transport = Ajax.getTransport(); - this.setOptions(options); - this.request(url); - }, - - request: function(url) { - var parameters = this.options.parameters || ''; - if (parameters.length > 0) parameters += '&_='; - - try { - this.url = url; - if (this.options.method == 'get' && parameters.length > 0) - this.url += (this.url.match(/\?/) ? '&' : '?') + parameters; - - Ajax.Responders.dispatch('onCreate', this, this.transport); - - this.transport.open(this.options.method, this.url, - this.options.asynchronous); - - if (this.options.asynchronous) { - this.transport.onreadystatechange = this.onStateChange.bind(this); - setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10); - } - - this.setRequestHeaders(); - - var body = this.options.postBody ? this.options.postBody : parameters; - this.transport.send(this.options.method == 'post' ? body : null); - - } catch (e) { - this.dispatchException(e); - } - }, - - setRequestHeaders: function() { - var requestHeaders = - ['X-Requested-With', 'XMLHttpRequest', - 'X-Prototype-Version', Prototype.Version]; - - if (this.options.method == 'post') { - requestHeaders.push('Content-type', - 'application/x-www-form-urlencoded'); - - /* Force "Connection: close" for Mozilla browsers to work around - * a bug where XMLHttpReqeuest sends an incorrect Content-length - * header. See Mozilla Bugzilla #246651. - */ - if (this.transport.overrideMimeType) - requestHeaders.push('Connection', 'close'); - } - - if (this.options.requestHeaders) - requestHeaders.push.apply(requestHeaders, this.options.requestHeaders); - - for (var i = 0; i < requestHeaders.length; i += 2) - this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]); - }, - - onStateChange: function() { - var readyState = this.transport.readyState; - if (readyState != 1) - this.respondToReadyState(this.transport.readyState); - }, - - header: function(name) { - try { - return this.transport.getResponseHeader(name); - } catch (e) {} - }, - - evalJSON: function() { - try { - return eval(this.header('X-JSON')); - } catch (e) {} - }, - - evalResponse: function() { - try { - return eval(this.transport.responseText); - } catch (e) { - this.dispatchException(e); - } - }, - - respondToReadyState: function(readyState) { - var event = Ajax.Request.Events[readyState]; - var transport = this.transport, json = this.evalJSON(); - - if (event == 'Complete') { - try { - (this.options['on' + this.transport.status] - || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')] - || Prototype.emptyFunction)(transport, json); - } catch (e) { - this.dispatchException(e); - } - - if ((this.header('Content-type') || '').match(/^text\/javascript/i)) - this.evalResponse(); - } - - try { - (this.options['on' + event] || Prototype.emptyFunction)(transport, json); - Ajax.Responders.dispatch('on' + event, this, transport, json); - } catch (e) { - this.dispatchException(e); - } - - /* Avoid memory leak in MSIE: clean up the oncomplete event handler */ - if (event == 'Complete') - this.transport.onreadystatechange = Prototype.emptyFunction; - }, - - dispatchException: function(exception) { - (this.options.onException || Prototype.emptyFunction)(this, exception); - Ajax.Responders.dispatch('onException', this, exception); - } -}); - -Ajax.Updater = Class.create(); - -Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { - initialize: function(container, url, options) { - this.containers = { - success: container.success ? $(container.success) : $(container), - failure: container.failure ? $(container.failure) : - (container.success ? null : $(container)) - } - - this.transport = Ajax.getTransport(); - this.setOptions(options); - - var onComplete = this.options.onComplete || Prototype.emptyFunction; - this.options.onComplete = (function(transport, object) { - this.updateContent(); - onComplete(transport, object); - }).bind(this); - - this.request(url); - }, - - updateContent: function() { - var receiver = this.responseIsSuccess() ? - this.containers.success : this.containers.failure; - var response = this.transport.responseText; - - if (!this.options.evalScripts) - response = response.stripScripts(); - - if (receiver) { - if (this.options.insertion) { - new this.options.insertion(receiver, response); - } else { - Element.update(receiver, response); - } - } - - if (this.responseIsSuccess()) { - if (this.onComplete) - setTimeout(this.onComplete.bind(this), 10); - } - } -}); - -Ajax.PeriodicalUpdater = Class.create(); -Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), { - initialize: function(container, url, options) { - this.setOptions(options); - this.onComplete = this.options.onComplete; - - this.frequency = (this.options.frequency || 2); - this.decay = (this.options.decay || 1); - - this.updater = {}; - this.container = container; - this.url = url; - - this.start(); - }, - - start: function() { - this.options.onComplete = this.updateComplete.bind(this); - this.onTimerEvent(); - }, - - stop: function() { - this.updater.onComplete = undefined; - clearTimeout(this.timer); - (this.onComplete || Prototype.emptyFunction).apply(this, arguments); - }, - - updateComplete: function(request) { - if (this.options.decay) { - this.decay = (request.responseText == this.lastText ? - this.decay * this.options.decay : 1); - - this.lastText = request.responseText; - } - this.timer = setTimeout(this.onTimerEvent.bind(this), - this.decay * this.frequency * 1000); - }, - - onTimerEvent: function() { - this.updater = new Ajax.Updater(this.container, this.url, this.options); - } -}); Deleted: trunk/framework/impl/src/main/javascript/prototype/array.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/array.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/array.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,77 +0,0 @@ -var $A = Array.from = function(iterable) { - if (!iterable) return []; - if (iterable.toArray) { - return iterable.toArray(); - } else { - var results = []; - for (var i = 0; i < iterable.length; i++) - results.push(iterable[i]); - return results; - } -} - -Object.extend(Array.prototype, Enumerable); - -Array.prototype._reverse = Array.prototype.reverse; - -Object.extend(Array.prototype, { - _each: function(iterator) { - for (var i = 0; i < this.length; i++) - iterator(this[i]); - }, - - clear: function() { - this.length = 0; - return this; - }, - - first: function() { - return this[0]; - }, - - last: function() { - return this[this.length - 1]; - }, - - compact: function() { - return this.select(function(value) { - return value != undefined || value != null; - }); - }, - - flatten: function() { - return this.inject([], function(array, value) { - return array.concat(value.constructor == Array ? - value.flatten() : [value]); - }); - }, - - without: function() { - var values = $A(arguments); - return this.select(function(value) { - return !values.include(value); - }); - }, - - indexOf: function(object) { - for (var i = 0; i < this.length; i++) - if (this[i] == object) return i; - return -1; - }, - - reverse: function(inline) { - return (inline !== false ? this : this.toArray())._reverse(); - }, - - shift: function() { - var result = this[0]; - for (var i = 0; i < this.length - 1; i++) - this[i] = this[i + 1]; - this.length--; - return result; - }, - - inspect: function() { - return '[' + this.map(Object.inspect).join(', ') + ']'; - } -}); Deleted: trunk/framework/impl/src/main/javascript/prototype/base.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/base.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/base.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,121 +0,0 @@ -var Class = { - create: function() { - return function() { - this.initialize.apply(this, arguments); - } - } -} - -var Abstract = new Object(); - -Object.extend = function(destination, source) { - for (property in source) { - destination[property] = source[property]; - } - return destination; -} - -Object.inspect = function(object) { - try { - if (object == undefined) return 'undefined'; - if (object == null) return 'null'; - return object.inspect ? object.inspect() : object.toString(); - } catch (e) { - if (e instanceof RangeError) return '...'; - throw e; - } -} - -Function.prototype.bind = function() { - var __method = this, args = $A(arguments), object = args.shift(); - return function() { - return __method.apply(object, args.concat($A(arguments))); - } -} - -Function.prototype.bindAsEventListener = function(object) { - var __method = this; - return function(event) { - return __method.call(object, event || window.event); - } -} - -Object.extend(Number.prototype, { - toColorPart: function() { - var digits = this.toString(16); - if (this < 16) return '0' + digits; - return digits; - }, - - succ: function() { - return this + 1; - }, - - times: function(iterator) { - $R(0, this, true).each(iterator); - return this; - } -}); - -var Try = { - these: function() { - var returnValue; - - for (var i = 0; i < arguments.length; i++) { - var lambda = arguments[i]; - try { - returnValue = lambda(); - break; - } catch (e) {} - } - - return returnValue; - } -} - -/*--------------------------------------------------------------------------*/ - -var PeriodicalExecuter = Class.create(); -PeriodicalExecuter.prototype = { - initialize: function(callback, frequency) { - this.callback = callback; - this.frequency = frequency; - this.currentlyExecuting = false; - - this.registerCallback(); - }, - - registerCallback: function() { - setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - onTimerEvent: function() { - if (!this.currentlyExecuting) { - try { - this.currentlyExecuting = true; - this.callback(); - } finally { - this.currentlyExecuting = false; - } - } - } -} - -/*--------------------------------------------------------------------------*/ - -function $() { - var elements = new Array(); - - for (var i = 0; i < arguments.length; i++) { - var element = arguments[i]; - if (typeof element == 'string') - element = document.getElementById(element); - - if (arguments.length == 1) - return element; - - elements.push(element); - } - - return elements; -} Deleted: trunk/framework/impl/src/main/javascript/prototype/compat.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/compat.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/compat.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,27 +0,0 @@ -if (!Array.prototype.push) { - Array.prototype.push = function() { - var startLength = this.length; - for (var i = 0; i < arguments.length; i++) - this[startLength + i] = arguments[i]; - return this.length; - } -} - -if (!Function.prototype.apply) { - // Based on code from http://www.youngpup.net/ - Function.prototype.apply = function(object, parameters) { - var parameterStrings = new Array(); - if (!object) object = window; - if (!parameters) parameters = new Array(); - - for (var i = 0; i < parameters.length; i++) - parameterStrings[i] = 'parameters[' + i + ']'; - - object.__apply__ = this; - var result = eval('object.__apply__(' + - parameterStrings.join(', ') + ')'); - object.__apply__ = null; - - return result; - } -} Deleted: trunk/framework/impl/src/main/javascript/prototype/dom.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/dom.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/dom.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,317 +0,0 @@ -document.getElementsByClassName = function(className, parentElement) { - var children = ($(parentElement) || document.body).getElementsByTagName('*'); - return $A(children).inject([], function(elements, child) { - if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) - elements.push(child); - return elements; - }); -} - -/*--------------------------------------------------------------------------*/ - -if (!window.Element) { - var Element = new Object(); -} - -Object.extend(Element, { - visible: function(element) { - return $(element).style.display != 'none'; - }, - - toggle: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - Element[Element.visible(element) ? 'hide' : 'show'](element); - } - }, - - hide: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - element.style.display = 'none'; - } - }, - - show: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - element.style.display = ''; - } - }, - - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - }, - - update: function(element, html) { - $(element).innerHTML = html.stripScripts(); - setTimeout(function() {html.evalScripts()}, 10); - }, - - getHeight: function(element) { - element = $(element); - return element.offsetHeight; - }, - - classNames: function(element) { - return new Element.ClassNames(element); - }, - - hasClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).include(className); - }, - - addClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).add(className); - }, - - removeClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).remove(className); - }, - - // removes whitespace-only text node children - cleanWhitespace: function(element) { - element = $(element); - for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - Element.remove(node); - } - }, - - empty: function(element) { - return $(element).innerHTML.match(/^\s*$/); - }, - - scrollTo: function(element) { - element = $(element); - var x = element.x ? element.x : element.offsetLeft, - y = element.y ? element.y : element.offsetTop; - window.scrollTo(x, y); - }, - - getStyle: function(element, style) { - element = $(element); - var value = element.style ? element.style[style.camelize()] : null; - if (!value) { - if (document.defaultView && document.defaultView.getComputedStyle) { - var css = document.defaultView.getComputedStyle(element, null); - value = css ? css.getPropertyValue(style) : null; - } else if (element.currentStyle) { - value = element.currentStyle[style.camelize()]; - } - } - - if (window.opera && ['left', 'top', 'right', 'bottom'].include(style)) - if (Element.getStyle(element, 'position') == 'static') value = 'auto'; - - return value == 'auto' ? null : value; - }, - - setStyle: function(element, style) { - element = $(element); - for (name in style) - element.style[name.camelize()] = style[name]; - }, - - getDimensions: function(element) { - element = $(element); - if (Element.getStyle(element, 'display') != 'none') - return {width: element.offsetWidth, height: element.offsetHeight}; - - // All *Width and *Height properties give 0 on elements with display none, - // so enable the element temporarily - var els = element.style; - var originalVisibility = els.visibility; - var originalPosition = els.position; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = ''; - var originalWidth = element.clientWidth; - var originalHeight = element.clientHeight; - els.display = 'none'; - els.position = originalPosition; - els.visibility = originalVisibility; - return {width: originalWidth, height: originalHeight}; - }, - - makePositioned: function(element) { - element = $(element); - var pos = Element.getStyle(element, 'position'); - if (pos == 'static' || !pos) { - element._madePositioned = true; - element.style.position = 'relative'; - // Opera returns the offset relative to the positioning context, when an - // element is position relative but top and left have not been defined - if (window.opera) { - element.style.top = 0; - element.style.left = 0; - } - } - }, - - undoPositioned: function(element) { - element = $(element); - if (element._madePositioned) { - element._madePositioned = undefined; - element.style.position = - element.style.top = - element.style.left = - element.style.bottom = - element.style.right = ''; - } - }, - - makeClipping: function(element) { - element = $(element); - if (element._overflow) return; - element._overflow = element.style.overflow; - if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') - element.style.overflow = 'hidden'; - }, - - undoClipping: function(element) { - element = $(element); - if (element._overflow) return; - element.style.overflow = element._overflow; - element._overflow = undefined; - } -}); - -var Toggle = new Object(); -Toggle.display = Element.toggle; - -/*--------------------------------------------------------------------------*/ - -Abstract.Insertion = function(adjacency) { - this.adjacency = adjacency; -} - -Abstract.Insertion.prototype = { - initialize: function(element, content) { - this.element = $(element); - this.content = content.stripScripts(); - - if (this.adjacency && this.element.insertAdjacentHTML) { - try { - this.element.insertAdjacentHTML(this.adjacency, this.content); - } catch (e) { - if (this.element.tagName.toLowerCase() == 'tbody') { - this.insertContent(this.contentFromAnonymousTable()); - } else { - throw e; - } - } - } else { - this.range = this.element.ownerDocument.createRange(); - if (this.initializeRange) this.initializeRange(); - this.insertContent([this.range.createContextualFragment(this.content)]); - } - - setTimeout(function() {content.evalScripts()}, 10); - }, - - contentFromAnonymousTable: function() { - var div = document.createElement('div'); - div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>'; - return $A(div.childNodes[0].childNodes[0].childNodes); - } -} - -var Insertion = new Object(); - -Insertion.Before = Class.create(); -Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), { - initializeRange: function() { - this.range.setStartBefore(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, this.element); - }).bind(this)); - } -}); - -Insertion.Top = Class.create(); -Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(true); - }, - - insertContent: function(fragments) { - fragments.reverse(false).each((function(fragment) { - this.element.insertBefore(fragment, this.element.firstChild); - }).bind(this)); - } -}); - -Insertion.Bottom = Class.create(); -Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.appendChild(fragment); - }).bind(this)); - } -}); - -Insertion.After = Class.create(); -Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), { - initializeRange: function() { - this.range.setStartAfter(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, - this.element.nextSibling); - }).bind(this)); - } -}); - -/*--------------------------------------------------------------------------*/ - -Element.ClassNames = Class.create(); -Element.ClassNames.prototype = { - initialize: function(element) { - this.element = $(element); - }, - - _each: function(iterator) { - this.element.className.split(/\s+/).select(function(name) { - return name.length > 0; - })._each(iterator); - }, - - set: function(className) { - this.element.className = className; - }, - - add: function(classNameToAdd) { - if (this.include(classNameToAdd)) return; - this.set(this.toArray().concat(classNameToAdd).join(' ')); - }, - - remove: function(classNameToRemove) { - if (!this.include(classNameToRemove)) return; - this.set(this.select(function(className) { - return className != classNameToRemove; - }).join(' ')); - }, - - toString: function() { - return this.toArray().join(' '); - } -} - -Object.extend(Element.ClassNames.prototype, Enumerable); Deleted: trunk/framework/impl/src/main/javascript/prototype/empty.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/empty.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/empty.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,5 +0,0 @@ -var Prototype = { - Version: '1.4.0', - emptyFunction: function() {}, - K: function(x) {return x} - } Deleted: trunk/framework/impl/src/main/javascript/prototype/enumerable.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/enumerable.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/enumerable.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,182 +0,0 @@ -var $break = new Object(); -var $continue = new Object(); - -var Enumerable = { - each: function(iterator) { - var index = 0; - try { - this._each(function(value) { - try { - iterator(value, index++); - } catch (e) { - if (e != $continue) throw e; - } - }); - } catch (e) { - if (e != $break) throw e; - } - }, - - all: function(iterator) { - var result = true; - this.each(function(value, index) { - result = result && !!(iterator || Prototype.K)(value, index); - if (!result) throw $break; - }); - return result; - }, - - any: function(iterator) { - var result = true; - this.each(function(value, index) { - if (result = !!(iterator || Prototype.K)(value, index)) - throw $break; - }); - return result; - }, - - collect: function(iterator) { - var results = []; - this.each(function(value, index) { - results.push(iterator(value, index)); - }); - return results; - }, - - detect: function (iterator) { - var result; - this.each(function(value, index) { - if (iterator(value, index)) { - result = value; - throw $break; - } - }); - return result; - }, - - findAll: function(iterator) { - var results = []; - this.each(function(value, index) { - if (iterator(value, index)) - results.push(value); - }); - return results; - }, - - grep: function(pattern, iterator) { - var results = []; - this.each(function(value, index) { - var stringValue = value.toString(); - if (stringValue.match(pattern)) - results.push((iterator || Prototype.K)(value, index)); - }) - return results; - }, - - include: function(object) { - var found = false; - this.each(function(value) { - if (value == object) { - found = true; - throw $break; - } - }); - return found; - }, - - inject: function(memo, iterator) { - this.each(function(value, index) { - memo = iterator(memo, value, index); - }); - return memo; - }, - - invoke: function(method) { - var args = $A(arguments).slice(1); - return this.collect(function(value) { - return value[method].apply(value, args); - }); - }, - - max: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (result == undefined || value >= result) - result = value; - }); - return result; - }, - - min: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (result == undefined || value < result) - result = value; - }); - return result; - }, - - partition: function(iterator) { - var trues = [], falses = []; - this.each(function(value, index) { - ((iterator || Prototype.K)(value, index) ? - trues : falses).push(value); - }); - return [trues, falses]; - }, - - pluck: function(property) { - var results = []; - this.each(function(value, index) { - results.push(value[property]); - }); - return results; - }, - - reject: function(iterator) { - var results = []; - this.each(function(value, index) { - if (!iterator(value, index)) - results.push(value); - }); - return results; - }, - - sortBy: function(iterator) { - return this.collect(function(value, index) { - return {value: value, criteria: iterator(value, index)}; - }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; - }).pluck('value'); - }, - - toArray: function() { - return this.collect(Prototype.K); - }, - - zip: function() { - var iterator = Prototype.K, args = $A(arguments); - if (typeof args.last() == 'function') - iterator = args.pop(); - - var collections = [this].concat(args).map($A); - return this.map(function(value, index) { - return iterator(collections.pluck(index)); - }); - }, - - inspect: function() { - return '#<Enumerable:' + this.toArray().inspect() + '>'; - } -} - -Object.extend(Enumerable, { - map: Enumerable.collect, - find: Enumerable.detect, - select: Enumerable.findAll, - member: Enumerable.include, - entries: Enumerable.toArray -}); Deleted: trunk/framework/impl/src/main/javascript/prototype/epilog.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/epilog.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/epilog.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,4 +0,0 @@ -/* -* final trail for ajax jsf library -*/ -// } \ No newline at end of file Deleted: trunk/framework/impl/src/main/javascript/prototype/event.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/event.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/event.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,107 +0,0 @@ -if (!window.Event) { - var Event = new Object(); -} - -Object.extend(Event, { - KEY_BACKSPACE: 8, - KEY_TAB: 9, - KEY_RETURN: 13, - KEY_ESC: 27, - KEY_LEFT: 37, - KEY_UP: 38, - KEY_RIGHT: 39, - KEY_DOWN: 40, - KEY_DELETE: 46, - - element: function(event) { - return event.target || event.srcElement; - }, - - isLeftClick: function(event) { - return (((event.which) && (event.which == 1)) || - ((event.button) && (event.button == 1))); - }, - - pointerX: function(event) { - return event.pageX || (event.clientX + - (document.documentElement.scrollLeft || document.body.scrollLeft)); - }, - - pointerY: function(event) { - return event.pageY || (event.clientY + - (document.documentElement.scrollTop || document.body.scrollTop)); - }, - - stop: function(event) { - if (event.preventDefault) { - event.preventDefault(); - event.stopPropagation(); - } else { - event.returnValue = false; - event.cancelBubble = true; - } - }, - - // find the first node with the given tagName, starting from the - // node the event was triggered on; traverses the DOM upwards - findElement: function(event, tagName) { - var element = Event.element(event); - while (element.parentNode && (!element.tagName || - (element.tagName.toUpperCase() != tagName.toUpperCase()))) - element = element.parentNode; - return element; - }, - - observers: false, - - _observeAndCache: function(element, name, observer, useCapture) { - if (!this.observers) this.observers = []; - if (element.addEventListener) { - this.observers.push([element, name, observer, useCapture]); - element.addEventListener(name, observer, useCapture); - } else if (element.attachEvent) { - this.observers.push([element, name, observer, useCapture]); - element.attachEvent('on' + name, observer); - } - }, - - unloadCache: function() { - if (!Event.observers) return; - for (var i = 0; i < Event.observers.length; i++) { - Event.stopObserving.apply(this, Event.observers[i]); - Event.observers[i][0] = null; - } - Event.observers = false; - }, - - observe: function(element, name, observer, useCapture) { - var element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.attachEvent)) - name = 'keydown'; - - this._observeAndCache(element, name, observer, useCapture); - }, - - stopObserving: function(element, name, observer, useCapture) { - var element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.detachEvent)) - name = 'keydown'; - - if (element.removeEventListener) { - element.removeEventListener(name, observer, useCapture); - } else if (element.detachEvent) { - element.detachEvent('on' + name, observer); - } - } -}); - -/* prevent memory leaks in IE */ -Event.observe(window, 'unload', Event.unloadCache, false); Deleted: trunk/framework/impl/src/main/javascript/prototype/form.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/form.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/form.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,298 +0,0 @@ -var Field = { - clear: function() { - for (var i = 0; i < arguments.length; i++) - $(arguments[i]).value = ''; - }, - - focus: function(element) { - $(element).focus(); - }, - - present: function() { - for (var i = 0; i < arguments.length; i++) - if ($(arguments[i]).value == '') return false; - return true; - }, - - select: function(element) { - $(element).select(); - }, - - activate: function(element) { - element = $(element); - element.focus(); - if (element.select) - element.select(); - } -} - -/*--------------------------------------------------------------------------*/ - -var Form = { - serialize: function(form) { - var elements = Form.getElements($(form)); - var queryComponents = new Array(); - - for (var i = 0; i < elements.length; i++) { - var queryComponent = Form.Element.serialize(elements[i]); - if (queryComponent) - queryComponents.push(queryComponent); - } - - return queryComponents.join('&'); - }, - - getElements: function(form) { - form = $(form); - var elements = new Array(); - - for (tagName in Form.Element.Serializers) { - var tagElements = form.getElementsByTagName(tagName); - for (var j = 0; j < tagElements.length; j++) - elements.push(tagElements[j]); - } - return elements; - }, - - getInputs: function(form, typeName, name) { - form = $(form); - var inputs = form.getElementsByTagName('input'); - - if (!typeName && !name) - return inputs; - - var matchingInputs = new Array(); - for (var i = 0; i < inputs.length; i++) { - var input = inputs[i]; - if ((typeName && input.type != typeName) || - (name && input.name != name)) - continue; - matchingInputs.push(input); - } - - return matchingInputs; - }, - - disable: function(form) { - var elements = Form.getElements(form); - for (var i = 0; i < elements.length; i++) { - var element = elements[i]; - element.blur(); - element.disabled = 'true'; - } - }, - - enable: function(form) { - var elements = Form.getElements(form); - for (var i = 0; i < elements.length; i++) { - var element = elements[i]; - element.disabled = ''; - } - }, - - findFirstElement: function(form) { - return Form.getElements(form).find(function(element) { - return element.type != 'hidden' && !element.disabled && - ['input', 'select', 'textarea'].include(element.tagName.toLowerCase()); - }); - }, - - focusFirstElement: function(form) { - Field.activate(Form.findFirstElement(form)); - }, - - reset: function(form) { - $(form).reset(); - } -} - -Form.Element = { - serialize: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - var parameter = Form.Element.Serializers[method](element); - - if (parameter) { - var key = encodeURIComponent(parameter[0]); - if (key.length == 0) return; - - if (parameter[1].constructor != Array) - parameter[1] = [parameter[1]]; - - return parameter[1].map(function(value) { - return key + '=' + encodeURIComponent(value); - }).join('&'); - } - }, - - getValue: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - var parameter = Form.Element.Serializers[method](element); - - if (parameter) - return parameter[1]; - } -} - -Form.Element.Serializers = { - input: function(element) { - switch (element.type.toLowerCase()) { - case 'submit': - case 'hidden': - case 'password': - case 'text': - return Form.Element.Serializers.textarea(element); - case 'checkbox': - case 'radio': - return Form.Element.Serializers.inputSelector(element); - } - return false; - }, - - inputSelector: function(element) { - if (element.checked) - return [element.name, element.value]; - }, - - textarea: function(element) { - return [element.name, element.value]; - }, - - select: function(element) { - return Form.Element.Serializers[element.type == 'select-one' ? - 'selectOne' : 'selectMany'](element); - }, - - selectOne: function(element) { - var value = '', opt, index = element.selectedIndex; - if (index >= 0) { - opt = element.options[index]; - value = opt.value; - if (!value && !('value' in opt)) - value = opt.text; - } - return [element.name, value]; - }, - - selectMany: function(element) { - var value = new Array(); - for (var i = 0; i < element.length; i++) { - var opt = element.options[i]; - if (opt.selected) { - var optValue = opt.value; - if (!optValue && !('value' in opt)) - optValue = opt.text; - value.push(optValue); - } - } - return [element.name, value]; - } -} - -/*--------------------------------------------------------------------------*/ - -var $F = Form.Element.getValue; - -/*--------------------------------------------------------------------------*/ - -Abstract.TimedObserver = function() {} -Abstract.TimedObserver.prototype = { - initialize: function(element, frequency, callback) { - this.frequency = frequency; - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - this.registerCallback(); - }, - - registerCallback: function() { - setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - onTimerEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - } -} - -Form.Element.Observer = Class.create(); -Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.Observer = Class.create(); -Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); - -/*--------------------------------------------------------------------------*/ - -Abstract.EventObserver = function() {} -Abstract.EventObserver.prototype = { - initialize: function(element, callback) { - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - if (this.element.tagName.toLowerCase() == 'form') - this.registerFormCallbacks(); - else - this.registerCallback(this.element); - }, - - onElementEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - }, - - registerFormCallbacks: function() { - var elements = Form.getElements(this.element); - for (var i = 0; i < elements.length; i++) - this.registerCallback(elements[i]); - }, - - registerCallback: function(element) { - if (element.type) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - Event.observe(element, 'click', this.onElementEvent.bind(this)); - break; - case 'password': - case 'text': - case 'textarea': - case 'select-one': - case 'select-multiple': - Event.observe(element, 'change', this.onElementEvent.bind(this)); - break; - } - } - } -} - -Form.Element.EventObserver = Class.create(); -Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.EventObserver = Class.create(); -Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); - Deleted: trunk/framework/impl/src/main/javascript/prototype/hash.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/hash.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/hash.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,47 +0,0 @@ -var Hash = { - _each: function(iterator) { - for (key in this) { - var value = this[key]; - if (typeof value == 'function') continue; - - var pair = [key, value]; - pair.key = key; - pair.value = value; - iterator(pair); - } - }, - - keys: function() { - return this.pluck('key'); - }, - - values: function() { - return this.pluck('value'); - }, - - merge: function(hash) { - return $H(hash).inject($H(this), function(mergedHash, pair) { - mergedHash[pair.key] = pair.value; - return mergedHash; - }); - }, - - toQueryString: function() { - return this.map(function(pair) { - return pair.map(encodeURIComponent).join('='); - }).join('&'); - }, - - inspect: function() { - return '#<Hash:{' + this.map(function(pair) { - return pair.map(Object.inspect).join(': '); - }).join(', ') + '}>'; - } -} - -function $H(object) { - var hash = Object.extend({}, object || {}); - Object.extend(hash, Enumerable); - Object.extend(hash, Hash); - return hash; -} Deleted: trunk/framework/impl/src/main/javascript/prototype/position.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/position.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/position.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,258 +0,0 @@ -var Position = { - // set to true if needed, warning: firefox performance problems - // NOT neeeded for page scrolling, only if draggable contained in - // scrollable elements - includeScrollOffsets: false, - - // must be called before calling withinIncludingScrolloffset, every time the - // page is scrolled - prepare: function() { - this.deltaX = window.pageXOffset - || document.documentElement.scrollLeft - || document.body.scrollLeft - || 0; - this.deltaY = window.pageYOffset - || document.documentElement.scrollTop - || document.body.scrollTop - || 0; - }, - - realOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - element = element.parentNode; - } while (element); - return [valueL, valueT]; - }, - - realOffsetOpera: function(element) { - var valueT = 0, valueL = 0; - do { - if (element && element.tagName.toLowerCase() != "tr") { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - } - element = element.parentNode; - } while (element && element != document.body); - return [valueL, valueT]; - }, - - cumulativeOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - } while (element); - return [valueL, valueT]; - }, - - positionedOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - if (element) { - p = Element.getStyle(element, 'position'); - if (p == 'relative' || p == 'absolute') break; - } - } while (element); - return [valueL, valueT]; - }, - - offsetParent: function(element) { - if (element.offsetParent && element.offsetParent.tagName.toLowerCase() != "html") return element.offsetParent; - if (element == document.body) return element; - - while ((element = element.parentNode) && element != document.body) - if (Element.getStyle(element, 'position') != 'static') - return element; - - return document.body; - }, - - // caches x/y coordinate pair to use with overlap - within: function(element, x, y) { - if (this.includeScrollOffsets) - return this.withinIncludingScrolloffsets(element, x, y); - this.xcomp = x; - this.ycomp = y; - this.offset = this.cumulativeOffset(element); - - return (y >= this.offset[1] && - y < this.offset[1] + element.offsetHeight && - x >= this.offset[0] && - x < this.offset[0] + element.offsetWidth); - }, - - withinIncludingScrolloffsets: function(element, x, y) { - var isOpera = (arguments.length > 3); - var offsetcache = (!isOpera) ? this.realOffset(element) : this.realOffsetOpera(element); - - this.xcomp = x + offsetcache[0] - (!isOpera ? this.deltaX : 0); - this.ycomp = y + offsetcache[1] - (!isOpera ? this.deltaY : 0); - this.offset = this.cumulativeOffset(element); - - return (this.ycomp >= this.offset[1] && - this.ycomp < this.offset[1] + element.offsetHeight && - this.xcomp >= this.offset[0] && - this.xcomp < this.offset[0] + element.offsetWidth); - }, - - // within must be called directly before - overlap: function(mode, element) { - if (!mode) return 0; - if (mode == 'vertical') - return ((this.offset[1] + element.offsetHeight) - this.ycomp) / - element.offsetHeight; - if (mode == 'horizontal') - return ((this.offset[0] + element.offsetWidth) - this.xcomp) / - element.offsetWidth; - }, - - clone: function(source, target) { - source = $(source); - target = $(target); - target.style.position = 'absolute'; - var offsets = this.cumulativeOffset(source); - target.style.top = offsets[1] + 'px'; - target.style.left = offsets[0] + 'px'; - target.style.width = source.offsetWidth + 'px'; - target.style.height = source.offsetHeight + 'px'; - }, - - page: function(forElement) { - var valueT = 0, valueL = 0; - - var element = forElement; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - - // Safari fix - if (element.offsetParent==document.body) - if (Element.getStyle(element,'position')=='absolute') break; - - } while (element = element.offsetParent); - - element = forElement; - do { - valueT -= element.scrollTop || 0; - valueL -= element.scrollLeft || 0; - } while (element = element.parentNode); - - return [valueL, valueT]; - }, - - clone: function(source, target) { - var options = Object.extend({ - setLeft: true, - setTop: true, - setWidth: true, - setHeight: true, - offsetTop: 0, - offsetLeft: 0 - }, arguments[2] || {}) - - // find page position of source - source = $(source); - var p = Position.page(source); - - // find coordinate system to use - target = $(target); - var delta = [0, 0]; - var parent = null; - // delta [0,0] will do fine with position: fixed elements, - // position:absolute needs offsetParent deltas - if (Element.getStyle(target,'position') == 'absolute') { - parent = Position.offsetParent(target); - delta = Position.page(parent); - } - - // correct by body offsets (fixes Safari) - if (parent == document.body) { - delta[0] -= document.body.offsetLeft; - delta[1] -= document.body.offsetTop; - } - - // set position - if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; - if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; - if(options.setWidth) target.style.width = source.offsetWidth + 'px'; - if(options.setHeight) target.style.height = source.offsetHeight + 'px'; - }, - - absolutize: function(element, moveToDocumentBody) { - element = $(element); - if (element.style.position == 'absolute') return; - Position.prepare(); - - var offsets = Position.positionedOffset(element); - var top = offsets[1]; - var left = offsets[0]; - var width = element.clientWidth; - var height = element.clientHeight; - - element._originalLeft = left - parseFloat(element.style.left || 0); - element._originalTop = top - parseFloat(element.style.top || 0); - element._originalWidth = element.style.width; - element._originalHeight = element.style.height; - - - if (arguments.length > 1 && moveToDocumentBody) { - element._originalParent = element.parentNode; - element._originalNextSibling = element.nextSibling; - var el = element.parentNode.removeChild(element); - document.body.appendChild(el); - } - element.style.position = 'absolute'; - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.width = width + 'px'; - element.style.height = height + 'px'; - }, - - relativize: function(element, moveToOriginalParent) { - element = $(element); - if (element.style.position == 'relative') return; - - if (arguments.length > 1 && moveToOriginalParent) { - var el = document.body.removeChild(element); - element._originalParent.insertBefore(el, element._originalNextSibling); - } - - Position.prepare(); - element.style.position = 'relative'; - var top = parseFloat(element.style.top || 0) - (element._originalTop || 0); - var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); - - element.style.top = top + 'px'; - element.style.left = left + 'px'; - if (element._originalHeight != "") element.style.height = element._originalHeight; - if (element._originalWidth != "") element.style.width = element._originalWidth; - } -} - -// Safari returns margins on body which is incorrect if the child is absolutely -// positioned. For performance reasons, redefine Position.cumulativeOffset for -// KHTML/WebKit only. -if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { - Position.cumulativeOffset = function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - if (element.offsetParent == document.body) - if (Element.getStyle(element, 'position') == 'absolute') break; - - element = element.offsetParent; - } while (element); - - return [valueL, valueT]; - } -} - - Deleted: trunk/framework/impl/src/main/javascript/prototype/prolog.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/prolog.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/prolog.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,5 +0,0 @@ -/* - * Prolog for avoid execute Prototype library twice. - */ - -//if(!window.Prototype){ Deleted: trunk/framework/impl/src/main/javascript/prototype/prototype.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/prototype.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/prototype.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,15 +0,0 @@ -/* Prototype assembly header */ -<%= include 'HEADER' %> - -var Prototype = { - Version: '<%= PROTOTYPE_VERSION %>', - - emptyFunction: function() {}, - K: function(x) {return x} -} - -<%= include 'base.js', 'string.js', 'empty.js' %> - -<%= include 'enumerable.js', 'array.js', 'hash.js', 'range.js' %> - -<%= include 'ajax.js', 'dom.js', 'form.js', 'event.js', 'position.js' %> \ No newline at end of file Deleted: trunk/framework/impl/src/main/javascript/prototype/range.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/range.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/range.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,29 +0,0 @@ -ObjectRange = Class.create(); -Object.extend(ObjectRange.prototype, Enumerable); -Object.extend(ObjectRange.prototype, { - initialize: function(start, end, exclusive) { - this.start = start; - this.end = end; - this.exclusive = exclusive; - }, - - _each: function(iterator) { - var value = this.start; - do { - iterator(value); - value = value.succ(); - } while (this.include(value)); - }, - - include: function(value) { - if (value < this.start) - return false; - if (this.exclusive) - return value < this.end; - return value <= this.end; - } -}); - -var $R = function(start, end, exclusive) { - return new ObjectRange(start, end, exclusive); -} \ No newline at end of file Deleted: trunk/framework/impl/src/main/javascript/prototype/string.js =================================================================== --- trunk/framework/impl/src/main/javascript/prototype/string.js 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/framework/impl/src/main/javascript/prototype/string.js 2008-03-12 00:07:21 UTC (rev 6728) @@ -1,69 +0,0 @@ -Object.extend(String.prototype, { - stripTags: function() { - return this.replace(/<\/?[^>]+>/gi, ''); - }, - - stripScripts: function() { - return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); - }, - - extractScripts: function() { - var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); - var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); - return (this.match(matchAll) || []).map(function(scriptTag) { - return (scriptTag.match(matchOne) || ['', ''])[1]; - }); - }, - - evalScripts: function() { - return this.extractScripts().map(eval); - }, - - escapeHTML: function() { - var div = document.createElement('div'); - var text = document.createTextNode(this); - div.appendChild(text); - return div.innerHTML; - }, - - unescapeHTML: function() { - var div = document.createElement('div'); - div.innerHTML = this.stripTags(); - return div.childNodes[0] ? div.childNodes[0].nodeValue : ''; - }, - - toQueryParams: function() { - var pairs = this.match(/^\??(.*)$/)[1].split('&'); - return pairs.inject({}, function(params, pairString) { - var pair = pairString.split('='); - params[pair[0]] = pair[1]; - return params; - }); - }, - - toArray: function() { - return this.split(''); - }, - - camelize: function() { - var oStringList = this.split('-'); - if (oStringList.length == 1) return oStringList[0]; - - var camelizedString = this.indexOf('-') == 0 - ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1) - : oStringList[0]; - - for (var i = 1, len = oStringList.length; i < len; i++) { - var s = oStringList[i]; - camelizedString += s.charAt(0).toUpperCase() + s.substring(1); - } - - return camelizedString; - }, - - inspect: function() { - return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'"; - } -}); - -String.prototype.parseQuery = String.prototype.toQueryParams; Added: trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -0,0 +1,89 @@ +/** + * + */ +package org.ajax4jsf.context; + +import org.ajax4jsf.component.AjaxContainer; +import org.ajax4jsf.renderkit.AjaxContainerRenderer; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * @author asmirnov + * + */ +public class AjaxContextImplTest extends AbstractAjax4JsfTestCase { + + private static final String FOO_BAR = "foo:bar"; + + /** + * @param name + */ + public AjaxContextImplTest(String name) { + super(name); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + public void setUp() throws Exception { + super.setUp(); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + public void tearDown() throws Exception { + super.tearDown(); + } + + /** + * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}. + */ + public void testDecode0() { + ajaxContext.decode(facesContext); + assertFalse(ajaxContext.isAjaxRequest()); + assertNull(ajaxContext.getSubmittedRegionClientId()); + assertNull(ajaxContext.getAjaxSingleClientId()); + } + + /** + * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}. + */ + public void testDecode1() { + request.addParameter(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR); + externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR); + ajaxContext.decode(facesContext); + assertTrue(ajaxContext.isAjaxRequest()); + assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId()); + assertNull(ajaxContext.getAjaxSingleClientId()); + } + + /** + * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#decode(javax.faces.context.FacesContext)}. + */ + public void testDecode2() { + externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR); + externalContext.addRequestParameterMap(AjaxRendererUtils.AJAX_SINGLE_PARAMETER_NAME, FOO_BAR); + ajaxContext.decode(facesContext); + assertTrue(ajaxContext.isAjaxRequest()); + assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId()); + assertEquals(FOO_BAR, ajaxContext.getAjaxSingleClientId()); + } + /** + * Test method for {@link org.ajax4jsf.context.AjaxContextImpl#release()}. + */ + public void testRelease() { + + } + + public void testGetCurrentInstance() throws Exception { + this.ajaxContext = null; + request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY); + externalContext.addRequestParameterMap(AjaxContainerRenderer.AJAX_PARAMETER_NAME, FOO_BAR); + ajaxContext = AjaxContext.getCurrentInstance(facesContext); + assertTrue(ajaxContext.isAjaxRequest()); + assertEquals(FOO_BAR, ajaxContext.getSubmittedRegionClientId()); + + } +} Property changes on: trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextImplTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextTest.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextTest.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextTest.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -0,0 +1,45 @@ +package org.ajax4jsf.context; + +import java.net.URL; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +public class AjaxContextTest extends AbstractAjax4JsfTestCase { + + public AjaxContextTest(String name) { + super(name); + } + + public void setUp() throws Exception { + super.setUp(); + } + + public void tearDown() throws Exception { + super.tearDown(); + } + + public void testGetCurrentInstance() { + AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance(); + assertSame(ajaxContext, ajaxContext2); + } + + public void testGetCurrentInstanceFacesContext() { + this.ajaxContext = null; + request.removeAttribute(AjaxContext.AJAX_CONTEXT_KEY); + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + ClassLoader loader = new ClassLoader(contextClassLoader){ + @Override + public URL getResource(String name) { + if(AjaxContext.SERVICE_RESOURCE.equals(name)){ + return super.getResource("META-INF/ajaxContext.txt"); + } else { + return super.getResource(name); + } + } + }; + Thread.currentThread().setContextClassLoader(loader); + AjaxContext ajaxContext2 = AjaxContext.getCurrentInstance(facesContext); + assertSame(MockAjaxContext.class,ajaxContext2.getClass()); + } + +} Property changes on: trunk/framework/test/src/test/java/org/ajax4jsf/context/AjaxContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java (rev 0) +++ trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -0,0 +1,328 @@ +/** + * + */ +package org.ajax4jsf.context; + +import java.io.IOException; +import java.util.Map; +import java.util.Set; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + +/** + * @author asmirnov + * + */ +public class MockAjaxContext extends AjaxContext { + + /** + * + */ + public MockAjaxContext() { + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent, java.lang.String) + */ + @Override + public void addComponentToAjaxRender(UIComponent base, String id) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#addComponentToAjaxRender(javax.faces.component.UIComponent) + */ + @Override + public void addComponentToAjaxRender(UIComponent component) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#addRegionsFromComponent(javax.faces.component.UIComponent) + */ + @Override + public void addRegionsFromComponent(UIComponent component) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#addRenderedArea(java.lang.String) + */ + @Override + public void addRenderedArea(String id) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#decode(javax.faces.context.FacesContext) + */ + @Override + public void decode(FacesContext context) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#encodeAjaxBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + */ + @Override + public void encodeAjaxBegin(FacesContext context, UIComponent component) + throws IOException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#encodeAjaxEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent) + */ + @Override + public void encodeAjaxEnd(FacesContext context, UIComponent component) + throws IOException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL(javax.faces.context.FacesContext) + */ + @Override + public String getAjaxActionURL(FacesContext context) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getAjaxActionURL() + */ + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getAjaxAreasToRender() + */ + @Override + public Set<String> getAjaxAreasToRender() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getAjaxRenderedAreas() + */ + @Override + public Set<String> getAjaxRenderedAreas() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getAjaxSingleClientId() + */ + @Override + public String getAjaxSingleClientId() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getCommonAjaxParameters() + */ + @Override + public Map<String, Object> getCommonAjaxParameters() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getOncomplete() + */ + @Override + public Object getOncomplete() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getResponseData() + */ + @Override + public Object getResponseData() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getResponseDataMap() + */ + @Override + public Map<String, Object> getResponseDataMap() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getSubmittedRegionClientId(javax.faces.context.FacesContext) + */ + @Override + public String getSubmittedRegionClientId() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#getViewIdHolder() + */ + @Override + public ViewIdHolder getViewIdHolder() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest(javax.faces.context.FacesContext) + */ + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#isAjaxRequest() + */ + @Override + public boolean isAjaxRequest() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#isSelfRender() + */ + @Override + public boolean isSelfRender() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#processHeadResources(javax.faces.context.FacesContext) + */ + @Override + public void processHeadResources(FacesContext context) + throws FacesException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#release() + */ + @Override + public void release() { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#removeRenderedArea(java.lang.String) + */ + @Override + public boolean removeRenderedArea(String id) { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#renderAjaxRegion(javax.faces.context.FacesContext, javax.faces.component.UIComponent, boolean) + */ + @Override + public void renderAjaxRegion(FacesContext context, UIComponent component, + boolean useFilterWriter) throws FacesException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#renderSubmittedAjaxRegion(javax.faces.context.FacesContext, boolean) + */ + @Override + public void renderSubmittedAjaxRegion(FacesContext context, + boolean useFilterWriter) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#renderSubmittedAjaxRegion(javax.faces.context.FacesContext) + */ + @Override + public void renderSubmittedAjaxRegion(FacesContext context) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#saveViewState(javax.faces.context.FacesContext) + */ + @Override + public void saveViewState(FacesContext context) throws IOException { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setAjaxRequest(boolean) + */ + @Override + public void setAjaxRequest(boolean b) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setAjaxSingleClientId(java.lang.String) + */ + @Override + public void setAjaxSingleClientId(String ajaxSingleClientId) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setOncomplete(java.lang.Object) + */ + @Override + public void setOncomplete(Object oncompleteFunction) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setResponseData(java.lang.Object) + */ + @Override + public void setResponseData(Object responseData) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setSelfRender(boolean) + */ + @Override + public void setSelfRender(boolean b) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.context.AjaxContext#setViewIdHolder(org.ajax4jsf.context.ViewIdHolder) + */ + @Override + public void setViewIdHolder(ViewIdHolder viewIdHolder) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/framework/test/src/test/resources/META-INF/ajaxContext.txt =================================================================== --- trunk/framework/test/src/test/resources/META-INF/ajaxContext.txt (rev 0) +++ trunk/framework/test/src/test/resources/META-INF/ajaxContext.txt 2008-03-12 00:07:21 UTC (rev 6728) @@ -0,0 +1 @@ +org.ajax4jsf.context.MockAjaxContext Property changes on: trunk/framework/test/src/test/resources/META-INF/ajaxContext.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/AjaxCommandRendererBase.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -98,8 +98,7 @@ protected boolean isSubmitted(FacesContext facesContext, UIComponent uiComponent) { // Componet accept only ajax requests. - if (!AjaxContext.getCurrentInstance(facesContext).isAjaxRequest( - facesContext)) { + if (!AjaxContext.getCurrentInstance(facesContext).isAjaxRequest()) { return false; } if (getUtils().isBooleanAttribute(uiComponent, "disabled")) { Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2008-03-11 19:58:43 UTC (rev 6727) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxPageRenderer.java 2008-03-12 00:07:21 UTC (rev 6728) @@ -155,7 +155,7 @@ // TODO - html attributes. lang - from current locale ? Locale locale = context.getViewRoot().getLocale(); out.writeAttribute(HTML.lang_ATTRIBUTE, locale.toString(), "lang"); - if (!AjaxContext.getCurrentInstance(context).isAjaxRequest(context)) { + if (!AjaxContext.getCurrentInstance(context).isAjaxRequest()) { out.startElement("head", component); // Out title - requied html element. Object title = attributes.get("pageTitle"); @@ -226,7 +226,7 @@ */ public boolean getRendersChildren() { FacesContext context = FacesContext.getCurrentInstance(); - if (AjaxContext.getCurrentInstance(context).isAjaxRequest(context)) { + if (AjaxContext.getCurrentInstance(context).isAjaxRequest()) { // Ajax Request. Control all output. return true; }

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6727 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: vsukhov Date: 2008-03-11 15:58:43 -0400 (Tue, 11 Mar 2008) New Revision: 6727 Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml trunk/docs/userguide/en/src/main/resources/images/comboBox2.png Log: http://jira.jboss.com/jira/browse/RF-1216 I've added Style Class rich-combobox-button-hovered, replaced message by label, corrected code sample(changed styleClass to listClass) Corrected screenshot; added Skin Parameters Redefinition for a font Modified: trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-03-11 18:44:41 UTC (rev 6726) +++ trunk/docs/userguide/en/src/main/docbook/included/comboBox.xml 2008-03-11 19:58:43 UTC (rev 6727) @@ -349,9 +349,9 @@ </tbody> </tgroup> </table> - + <table> - <title>Skin parameters redefinition for a default message</title> + <title>Skin parameters redefinition for a font</title> <tgroup cols="2"> <thead> <row> @@ -361,6 +361,27 @@ </thead> <tbody> <row> + <entry>itemSizeFont</entry> + <entry>font-size</entry> + </row> + <row> + <entry>itemFamilyFont</entry> + <entry>font-family</entry> + </row> + </tbody> + </tgroup> + </table> + <table> + <title>Skin parameters redefinition for a default label</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Skin parameters</entry> + <entry>CSS properties</entry> + </row> + </thead> + <tbody> + <row> <entry>generalBackgroundColor</entry> <entry>background-color</entry> </row> @@ -481,6 +502,10 @@ <entry>Defines styles for an inactive button</entry> </row> <row> + <entry>rich-combobox-button-hovered</entry> + <entry>Defines styles for a hovered button</entry> + </row> + <row> <entry>rich-combobox-button-icon-inactive</entry> <entry>Defines styles for an inactive button icon</entry> </row> @@ -513,7 +538,7 @@ </tgroup> </table> <table> - <title>Classes names that define default message representation</title> + <title>Classes names that define default label representation</title> <tgroup cols="2"> <thead> <row> @@ -589,19 +614,19 @@ font-weight:bold; } ...]]></programlisting> - <para>The <emphasis><property>"styleClass"</property></emphasis> attribute for <emphasis role="bold" + <para>The <emphasis><property>"listClass"</property></emphasis> attribute for <emphasis role="bold" ><property><rich:comboBox></property></emphasis> is defined as it’s shown in the example below:</para> <para> <emphasis role="bold">Example:</emphasis> </para> - <programlisting role="CSS"><![CDATA[<cmb:comboBox ... styleClass="myClass"/> + <programlisting role="CSS"><![CDATA[<rich:comboBox ... listClass="myClass"/> ]]></programlisting> <para>This is a result:</para> <figure> - <title>Redefinition styles with own classes and <emphasis><property>styleClass</property></emphasis> attributes</title> + <title>Redefinition styles with own classes and <emphasis><property>"listClass"</property></emphasis> attributes</title> <mediaobject> <imageobject> <imagedata fileref="images/comboboxStyle.png"/> Modified: trunk/docs/userguide/en/src/main/resources/images/comboBox2.png =================================================================== (Binary files differ)

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6726 - in trunk/ui/datascroller/src: main/java/org/richfaces and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-03-11 14:44:41 -0400 (Tue, 11 Mar 2008) New Revision: 6726 Added: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java trunk/ui/datascroller/src/main/java/org/richfaces/taglib/ trunk/ui/datascroller/src/main/java/org/richfaces/taglib/DatascrollerTagHandlerBase.java Removed: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java trunk/ui/datascroller/src/main/java/org/richfaces/event/ Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml trunk/ui/datascroller/src/main/java/org/richfaces/component/DataScrollerViewPhaseListener.java trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java trunk/ui/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java Log: http://jira.jboss.com/jira/browse/RF-1133 Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml =================================================================== --- trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-03-11 18:44:41 UTC (rev 6726) @@ -38,7 +38,7 @@ <taghandler generate="true"> <classname>org.richfaces.taglib.DataScrollerTagHandler</classname> - <superclass>com.sun.facelets.tag.jsf.ComponentHandler</superclass> + <superclass>org.richfaces.taglib.DatascrollerTagHandlerBase</superclass> </taghandler> <!-- @@ -246,13 +246,9 @@ <name>actionExpression</name> </property> - <property hidden="true"> - <name>firstRow</name> - </property> - - <property hidden="true"> + <property> <name>page</name> - <classname>java.lang.String</classname> + <classname>int</classname> </property> <property> @@ -266,7 +262,7 @@ <classname>java.lang.String</classname> <description>Name of variable in request scope containing number of pages</description> </property> - + </component> &listeners; </components> Modified: trunk/ui/datascroller/src/main/java/org/richfaces/component/DataScrollerViewPhaseListener.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/component/DataScrollerViewPhaseListener.java 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/main/java/org/richfaces/component/DataScrollerViewPhaseListener.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -52,11 +52,10 @@ if (component.isRendered()) { if (component instanceof UIDatascroller) { UIDatascroller datascroller = (UIDatascroller) component; - datascroller.updateFirstRow(); UIData dataTable = datascroller.getDataTable(); if (dataTable.isRendered()) { - dataTable.setFirst(datascroller.getFirstRow()); + dataTable.setFirst(datascroller.setupFirstRowValue()); } } Deleted: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -1,585 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * 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-1301 USA - */ - -package org.richfaces.component; - -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.faces.FacesException; -import javax.faces.application.FacesMessage; -import javax.faces.component.ActionSource; -import javax.faces.component.UIComponent; -import javax.faces.component.UIData; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; - -import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.renderkit.RendererUtils; -import org.richfaces.component.util.MessageUtil; -import org.richfaces.event.DataScrollerEvent; -import org.richfaces.event.DataScrollerListener; -import org.richfaces.event.DataScrollerSource; - - -/** JSF component class */ -//xxxx nick -> alex - extend UIComponentBase and -//create event listener & event classes to define PageSwitchEvent -//public abstract class UIDatascroller extends UIComponentBase implements DataScrollerSource{ -public abstract class UIDatascroller extends AjaxActionComponent -implements DataScrollerSource, ActionSource { - - private Integer firstRow; - - public static final String COMPONENT_TYPE = "org.richfaces.Datascroller"; - public static final String COMPONENT_FAMILY = "org.richfaces.Datascroller"; - - public static final String FIRST_FACET_NAME = "first"; - - public static final String LAST_FACET_NAME = "last"; - - public static final String NEXT_FACET_NAME = "next"; - - public static final String PREVIOUS_FACET_NAME = "previous"; - - public static final String FAST_FORWARD_FACET_NAME = "fastforward"; - - public static final String FAST_REWIND_FACET_NAME = "fastrewind"; - - - public static final String FIRST_DISABLED_FACET_NAME = "first_disabled"; - - public static final String LAST_DISABLED_FACET_NAME = "last_disabled"; - - public static final String NEXT_DISABLED_FACET_NAME = "next_disabled"; - - public static final String PREVIOUS_DISABLED_FACET_NAME - = "previous_disabled"; - - public static final String FAST_FORWARD_DISABLED_FACET_NAME - = "fastforward_disabled"; - - public static final String FAST_REWIND_DISABLED_FACET_NAME - = "fastrewind_disabled"; - - public void addScrollerListener(DataScrollerListener listener) { - addFacesListener(listener); - } - - public DataScrollerListener[] getScrollerListeners() { - return (DataScrollerListener[]) getFacesListeners( - DataScrollerListener.class); - } - - public void removeScrollerListener(DataScrollerListener listener) { - removeFacesListener(listener); - } - - public void broadcast(FacesEvent event) throws AbortProcessingException { - super.broadcast(event); - if (event instanceof DataScrollerEvent) { - DataScrollerEvent dataScrollerEvent = (DataScrollerEvent) event; - setPage(dataScrollerEvent.getNewScrolVal(), true); - - FacesContext context = FacesContext.getCurrentInstance(); - AjaxRendererUtils.addRegionByName(context, this, this.getId()); - AjaxRendererUtils.addRegionByName(context, this, this.getFor()); - - setupReRender(context); - - MethodExpression scrollerListener = getScrollerListener(); - if (scrollerListener != null) { - scrollerListener.invoke(context.getELContext(), new Object[]{event}); - } - } - } - - public abstract MethodExpression getScrollerListener(); - - public abstract void setScrollerListener(MethodExpression scrollerListener); - - public abstract void setFor(String f); - - public abstract String getFor(); - - public abstract int getFastStep(); - - public abstract void setFastStep(int FastStep); - - public abstract boolean isRenderIfSinglePage(); - - public abstract void setRenderIfSinglePage(boolean renderIfSinglePage); - - public abstract int getMaxPages(); - - public abstract void setMaxPages(int maxPages); - - public abstract String getSelectedStyleClass(); - - public abstract void setSelectedStyleClass(String selectedStyleClass); - - public abstract String getSelectedStyle(); - - public abstract void setSelectedStyle(String selectedStyle); - - public abstract String getEventsQueue(); - - public abstract void setEventsQueue(String eventsQueue); - - public abstract boolean isAjaxSingle(); - - public abstract void setAjaxSingle(boolean ajaxSingle); - - public abstract int getRequestDelay(); - - public abstract void setRequestDelay(int requestDelay); - - public abstract String getTableStyleClass(); - - public abstract void setTableStyleClass(String tableStyleClass); - - public abstract String getStyleClass(); - - public abstract String getStyle(); - - public abstract void setStyleClass(String styleClass); - - public abstract void setStyle(String styleClass); - - public abstract String getAlign(); - - public abstract void setAlign(String align); - - public abstract String getBoundaryControls(); - - public abstract void setBoundaryControls(String boundaryControls); - - public abstract String getFastControls(); - - public abstract void setFastControls(String fastControls); - - public abstract String getStepControls(); - - public abstract void setStepControls(String stepControls); - - public abstract String getInactiveStyleClass(); - - public abstract String getInactiveStyle(); - - public abstract void setInactiveStyleClass(String inactiveStyleClass); - - public abstract void setInactiveStyle(String inactiveStyle); - /** - * Finds the dataTable which id is mapped to the "for" property - * - * @return the dataTable component - */ - public UIData getDataTable() { - String forAttribute = getFor(); - UIComponent forComp; - if (forAttribute == null) { - forComp = this; - while ((forComp = forComp.getParent()) != null) { - if (forComp instanceof UIData) { - setFor(forComp.getId()); - return (UIData) forComp; - } - } - throw new FacesException( - "could not find dataTable for datascroller " + this.getId()); - } else { - forComp = RendererUtils.getInstance().findComponentFor(this, forAttribute); - } - if (forComp == null) { - throw new IllegalArgumentException("could not find dataTable with id '" - + forAttribute + "'"); - } else if (!(forComp instanceof UIData)) { - throw new IllegalArgumentException( - "component with id '" + forAttribute - + "' must be of type " + UIData.class.getName() - + ", not type " - + forComp.getClass().getName()); - } - return (UIData) forComp; - } - - public int getPageIndex(UIData uiData) { - //xxxx nick -> alex - suppose this.getRows() would be better here - int rows = getRows(uiData); - if (0 == rows) { - throw new FacesException("Missing 'rows' attribute on component '" - + uiData.getId() + "'"); - } - - int firstRow = getFirstRow(); - - int pageIndex; - if (rows > 0) { - //xxxx nick -> alex - suppose this.getFirst() would be better here - pageIndex = firstRow / rows + 1; - } else { - //TODO nick -> nick - is it valid if under 0? - pageIndex = 0; - } - - if (firstRow % rows > 0) { - pageIndex++; - } - - return pageIndex; - } - - /** - * Gets the index of the current page - * - * @return the page index - */ - public int getPageIndex() { - UIData uiData = getDataTable(); - return getPageIndex(uiData); - } - - private void setFirstRowValue(int row) { - FacesContext context = getFacesContext(); - ValueExpression ve = getValueExpression("firstRow"); - if (ve != null) { - try { - ve.setValue(context.getELContext(), row); - firstRow = null; - } catch (ELException e) { - String messageStr = e.getMessage(); - Throwable result = e.getCause(); - while (null != result && - result.getClass().isAssignableFrom(ELException.class)) { - messageStr = result.getMessage(); - result = result.getCause(); - } - FacesMessage message; - if (null == messageStr) { - message = - MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel( - context, this) }); - } else { - message = new FacesMessage(FacesMessage.SEVERITY_ERROR, - messageStr, - messageStr); - } - context.getExternalContext().log(message.getSummary(), result); - context.addMessage(getClientId(context), message); - context.renderResponse(); - } catch (IllegalArgumentException e) { - FacesMessage message = - MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel( - context, this) }); - context.getExternalContext().log(message.getSummary(), e); - context.addMessage(getClientId(context), message); - context.renderResponse(); - } catch (Exception e) { - FacesMessage message = - MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, - new Object[] { MessageUtil.getLabel( - context, this) }); - context.getExternalContext().log(message.getSummary(), e); - context.addMessage(getClientId(context), message); - context.renderResponse(); - } - } else { - setFirstRow(row); - } - //TODO - } - - private int getFirstRowForLastPage(int rowCount, int rows) { - int delta = rowCount % rows; - int newFirst = delta > 0 && delta < rows ? rowCount - delta : rowCount - - rows; - if (newFirst >= 0) { - return newFirst; - } else { - return 0; - } - } - - /** - * Sets the page number according to the parameter recived from the - * commandLink - * - * @param facetName - can be "first:, "last", "next", "previous", - * "fastforward", "fastrewind" - */ - public void setPage(String facetName) { - setPage(facetName, false); - } - - public void setPage(String facetName, boolean updateModel) { - // check if facet is selected - if (FIRST_FACET_NAME.equals(facetName)) { - setFirstRowValue(0); - } else { - UIData dataTable = getDataTable(); - - int first = getFirstRow(); - int rows = getRows(dataTable); - int rowCount = getRowCount(dataTable); - - if (PREVIOUS_FACET_NAME.equals(facetName)) { - int previous = first - rows; - if (previous >= 0) { - setFirstRowValue(previous); - } - } else if (NEXT_FACET_NAME.equals(facetName)) { - int next = first + rows; - if (next < rowCount) { - setFirstRowValue(next); - } - //if (rows>0){ - // if (((next+rows)/rows)>getMaxPages()){ - // next=getMaxPages()*rows-rows;; - // } - //} - } else if (FAST_FORWARD_FACET_NAME.equals(facetName)) { - int fastStep = getFastStep(); - if (fastStep <= 0) { - fastStep = 1; - } - int next = first + rows * fastStep; - if (next >= rowCount) { - next = (rowCount - 1) - ((rowCount - 1) % rows); - } - //if (rows>0){ - // if (((next+rows)/rows)>getMaxPages()){ - // next=getMaxPages()*rows-rows;; - //} - //} - setFirstRowValue(next); - } else if (FAST_REWIND_FACET_NAME.equals(facetName)) { - int fastStep = getFastStep(); - if (fastStep <= 0) { - fastStep = 1; - } - int previous = first - rows * fastStep; - if (previous < 0) { - previous = 0; - } - setFirstRowValue(previous); - } else if (LAST_FACET_NAME.equals(facetName)) { - setFirstRow(getFirstRowForLastPage(rowCount, rows)); - } - // the paginator is selected - else { - int pageindex = Integer.parseInt(facetName); - int pageCount = getPageCount(rowCount, rows); - if (pageindex > pageCount) { - pageindex = pageCount; - } else if (pageindex <= 0) { - pageindex = 1; - } - setFirstRowValue(rows * (pageindex - 1)); - } - - } - - } - - public int getPageCount(int rowCount, int rows) { - int pageCount; - if (rows > 0) { - pageCount = rows <= 0 ? 1 : rowCount / rows; - if (rowCount % rows > 0) { - pageCount++; - } - if (pageCount == 0) { - pageCount = 1; - } - } else { - rows = 1; - pageCount = 1; - } - return pageCount; - } - - public int getPageCount(UIData data) { - return getPageCount(getRowCount(data), getRows(data)); - } - - /** @return the page count of the uidata */ - public int getPageCount() { - return getPageCount(getDataTable()); - } - - public int getRowCount(UIData data) { - int rowCount = data.getRowCount(); - if (rowCount >= 0) { - return rowCount; - } - - return BinarySearch.search(data); - } - - /** @return int */ - public int getRowCount() { - //xxx nick -> alex - scrollable models can return -1 here - //let's implement "dychotomic" discovery - // setPage(1)... if isPageAvailable() setPage(2) then 4, 8, etc. - // setPage() { setRowIndex(pageIdx * rows); } - // isPageAvailable() { return isRowAvailable() } - //return getUIData().getRowCount(); - return getRowCount(getDataTable()); - } - - public int getRows(UIData data) { - int row = 0; - row = data.getRows(); - if (row == 0) { - row = getRowCount(data); - } - - return row; - } - - // facet getter methods - public UIComponent getFirst() { - return getFacet(FIRST_FACET_NAME); - } - - public UIComponent getLast() { - return getFacet(LAST_FACET_NAME); - } - - public UIComponent getNext() { - return getFacet(NEXT_FACET_NAME); - } - - public UIComponent getFastForward() { - return getFacet(FAST_FORWARD_FACET_NAME); - } - - public UIComponent getFastRewind() { - return getFacet(FAST_REWIND_FACET_NAME); - } - - public UIComponent getPrevious() { - return getFacet(PREVIOUS_FACET_NAME); - } - - public void updateFirstRow() { - UIData dataTable = getDataTable(); - int rowCount = getRowCount(dataTable); - int firstRow = getFirstRow(); - - if (firstRow < 0) { - setFirstRow(0); - } else if (firstRow >= rowCount) { - setFirstRow(getFirstRowForLastPage(rowCount, getRows(dataTable))); - } - } - - public int getFirstRow() { - if (this.firstRow != null) { - return firstRow; - } - - ValueExpression ve = getValueExpression("firstRow"); - if (ve != null) { - try { - Integer firstRowObject = (Integer) ve.getValue(getFacesContext().getELContext()); - - if (firstRowObject != null) { - return firstRowObject; - } else { - return 0; - } - } catch (ELException e) { - throw new FacesException(e); - } - } else { - return 0; - } - } - - public void setFirstRow(int row) { - this.firstRow = row; - } - - public String getFamily() { - return COMPONENT_FAMILY; - } - - static class BinarySearch { - - public static int search(UIData data) { - int rowIndex = data.getRowIndex(); - try { - int n = 1; - int k = 2; - for (; ;) { - data.setRowIndex(k - 1); - if (data.isRowAvailable()) { - n = k; - k = k * 2; - } else { - break; - } - } - - while (n < k) { - int kk = Math.round((n + k) / 2) + 1; - data.setRowIndex(kk - 1); - if (data.isRowAvailable()) { - n = kk; - } else { - k = kk - 1; - } - } - - data.setRowIndex(k - 1); - if (data.isRowAvailable()) { - return k; - } else { - return 0; - } - } finally { - data.setRowIndex(rowIndex); - } - } - } - - public Object saveState(FacesContext context) { - return new Object[] { - super.saveState(context), - firstRow, - }; - - } - - public void restoreState(FacesContext context, Object object) { - Object[] state = (Object[]) object; - - super.restoreState(context, state[0]); - firstRow = (Integer) state[1]; - } - -} Added: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java (rev 0) +++ trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -0,0 +1,583 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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-1301 USA + */ + +package org.richfaces.component; + +import javax.el.ELException; +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import javax.faces.FacesException; +import javax.faces.application.FacesMessage; +import javax.faces.component.ActionSource; +import javax.faces.component.UIComponent; +import javax.faces.component.UIData; +import javax.faces.component.UIInput; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; + +import org.ajax4jsf.component.AjaxActionComponent; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils; +import org.richfaces.component.util.MessageUtil; +import org.richfaces.event.DataScrollerEvent; +import org.richfaces.event.DataScrollerListener; +import org.richfaces.event.DataScrollerSource; + + +/** JSF component class */ +//xxxx nick -> alex - extend UIComponentBase and +//create event listener & event classes to define PageSwitchEvent +//public abstract class UIDatascroller extends UIComponentBase implements DataScrollerSource{ +public abstract class UIDatascroller extends AjaxActionComponent +implements DataScrollerSource, ActionSource { + + private Integer pageNumber; + + public static final String COMPONENT_TYPE = "org.richfaces.Datascroller"; + public static final String COMPONENT_FAMILY = "org.richfaces.Datascroller"; + + public static final String FIRST_FACET_NAME = "first"; + + public static final String LAST_FACET_NAME = "last"; + + public static final String NEXT_FACET_NAME = "next"; + + public static final String PREVIOUS_FACET_NAME = "previous"; + + public static final String FAST_FORWARD_FACET_NAME = "fastforward"; + + public static final String FAST_REWIND_FACET_NAME = "fastrewind"; + + + public static final String FIRST_DISABLED_FACET_NAME = "first_disabled"; + + public static final String LAST_DISABLED_FACET_NAME = "last_disabled"; + + public static final String NEXT_DISABLED_FACET_NAME = "next_disabled"; + + public static final String PREVIOUS_DISABLED_FACET_NAME + = "previous_disabled"; + + public static final String FAST_FORWARD_DISABLED_FACET_NAME + = "fastforward_disabled"; + + public static final String FAST_REWIND_DISABLED_FACET_NAME + = "fastrewind_disabled"; + + public void addScrollerListener(DataScrollerListener listener) { + addFacesListener(listener); + } + + public DataScrollerListener[] getScrollerListeners() { + return (DataScrollerListener[]) getFacesListeners( + DataScrollerListener.class); + } + + public void removeScrollerListener(DataScrollerListener listener) { + removeFacesListener(listener); + } + + public void broadcast(FacesEvent event) throws AbortProcessingException { + super.broadcast(event); + if (event instanceof DataScrollerEvent) { + DataScrollerEvent dataScrollerEvent = (DataScrollerEvent) event; + + updateModel(dataScrollerEvent.getPage()); + + FacesContext context = FacesContext.getCurrentInstance(); + AjaxRendererUtils.addRegionByName(context, this, this.getId()); + AjaxRendererUtils.addRegionByName(context, this, this.getFor()); + + setupReRender(context); + + MethodExpression scrollerListener = getScrollerListener(); + if (scrollerListener != null) { + scrollerListener.invoke(context.getELContext(), new Object[]{event}); + } + } + } + + public abstract MethodExpression getScrollerListener(); + + public abstract void setScrollerListener(MethodExpression scrollerListener); + + public abstract void setFor(String f); + + public abstract String getFor(); + + public abstract int getFastStep(); + + public abstract void setFastStep(int FastStep); + + public abstract boolean isRenderIfSinglePage(); + + public abstract void setRenderIfSinglePage(boolean renderIfSinglePage); + + public abstract int getMaxPages(); + + public abstract void setMaxPages(int maxPages); + + public abstract String getSelectedStyleClass(); + + public abstract void setSelectedStyleClass(String selectedStyleClass); + + public abstract String getSelectedStyle(); + + public abstract void setSelectedStyle(String selectedStyle); + + public abstract String getEventsQueue(); + + public abstract void setEventsQueue(String eventsQueue); + + public abstract boolean isAjaxSingle(); + + public abstract void setAjaxSingle(boolean ajaxSingle); + + public abstract int getRequestDelay(); + + public abstract void setRequestDelay(int requestDelay); + + public abstract String getTableStyleClass(); + + public abstract void setTableStyleClass(String tableStyleClass); + + public abstract String getStyleClass(); + + public abstract String getStyle(); + + public abstract void setStyleClass(String styleClass); + + public abstract void setStyle(String styleClass); + + public abstract String getAlign(); + + public abstract void setAlign(String align); + + public abstract String getBoundaryControls(); + + public abstract void setBoundaryControls(String boundaryControls); + + public abstract String getFastControls(); + + public abstract void setFastControls(String fastControls); + + public abstract String getStepControls(); + + public abstract void setStepControls(String stepControls); + + public abstract String getInactiveStyleClass(); + + public abstract String getInactiveStyle(); + + public abstract void setInactiveStyleClass(String inactiveStyleClass); + + public abstract void setInactiveStyle(String inactiveStyle); + /** + * Finds the dataTable which id is mapped to the "for" property + * + * @return the dataTable component + */ + public UIData getDataTable() { + String forAttribute = getFor(); + UIComponent forComp; + if (forAttribute == null) { + forComp = this; + while ((forComp = forComp.getParent()) != null) { + if (forComp instanceof UIData) { + setFor(forComp.getId()); + return (UIData) forComp; + } + } + throw new FacesException( + "could not find dataTable for datascroller " + this.getId()); + } else { + forComp = RendererUtils.getInstance().findComponentFor(this, forAttribute); + } + if (forComp == null) { + throw new IllegalArgumentException("could not find dataTable with id '" + + forAttribute + "'"); + } else if (!(forComp instanceof UIData)) { + throw new IllegalArgumentException( + "component with id '" + forAttribute + + "' must be of type " + UIData.class.getName() + + ", not type " + + forComp.getClass().getName()); + } + return (UIData) forComp; + } + + /** + * Gets the index of the current page + * + * @param data + * @param pageCount + * @return the page index + */ + public int getPageIndex(UIData data, int pageCount) { + int page = getPage(); + if (page < 0) { + if (pageCount == 0) { + page = 1; + } else { + page = pageCount + page + 1; + } + } + + return page; + } + + private int getFastStepOrDefault() { + int step = getFastStep(); + if (step <= 0) { + return 1; + } else { + return step; + } + } + + public int getPageForFacet(String facetName) { + UIData dataTable = getDataTable(); + int pageCount = getPageCount(dataTable); + int pageIndex = getPageIndex(dataTable, pageCount); + + return getPageForFacet(facetName, pageIndex, pageCount); + } + + public int getPageForFacet(String facetName, int pageIndex, int pageCount) { + int newPage = 1; + + if (FIRST_FACET_NAME.equals(facetName)) { + newPage = 1; + } else if (PREVIOUS_FACET_NAME.equals(facetName)) { + newPage = pageIndex - 1; + } else if (NEXT_FACET_NAME.equals(facetName)) { + newPage = pageIndex + 1; + } else if (LAST_FACET_NAME.equals(facetName)) { + newPage = pageCount > 0 ? pageCount : 1; + } else if (FAST_FORWARD_FACET_NAME.equals(facetName)) { + newPage = pageIndex + getFastStepOrDefault(); + } else if (FAST_REWIND_FACET_NAME.equals(facetName)) { + newPage = pageIndex - getFastStepOrDefault(); + } else { + if (facetName != null) { + try { + newPage = Integer.parseInt(facetName.toString()); + } catch (NumberFormatException e) { + throw new FacesException(e.getLocalizedMessage(), e); + } + } + + if (newPage < 0) { + if (pageCount == 0) { + newPage = 1; + } else { + //newPage = -1 should scroll to the last one + newPage = pageCount + newPage + 1; + } + } + } + + if (newPage >= 1 && newPage <= pageCount) { + return newPage; + } else if (newPage == 0) { + return 1; + } else { + return -1; + } + } + + /** + * Sets the page number according to the parameter recived from the + * commandLink + * + * @param facetName - can be "first:, "last", "next", "previous", + * "fastforward", "fastrewind" + * + * @see #setPage(int) + * @see #getPageForFacet(String) + * + * @deprecated as of 3.2 replaced with <code>setPage(int)</page> + */ + public void setPage(String facetName) { + int newPage = getPageForFacet(facetName); + if (newPage > 0) { + setPage(newPage); + } + } + + public int getPageCount(UIData data) { + int rowCount = getRowCount(data); + int rows = getRows(data); + + int pageCount; + if (rows > 0) { + pageCount = rows <= 0 ? 1 : rowCount / rows; + if (rowCount % rows > 0) { + pageCount++; + } + if (pageCount == 0) { + pageCount = 1; + } + } else { + rows = 1; + pageCount = 1; + } + return pageCount; + } + + /** @return the page count of the uidata */ + public int getPageCount() { + return getPageCount(getDataTable()); + } + + public int getRowCount(UIData data) { + int rowCount = data.getRowCount(); + if (rowCount >= 0) { + return rowCount; + } + + return BinarySearch.search(data); + } + + /** @return int */ + public int getRowCount() { + //xxx nick -> alex - scrollable models can return -1 here + //let's implement "dychotomic" discovery + // setPage(1)... if isPageAvailable() setPage(2) then 4, 8, etc. + // setPage() { setRowIndex(pageIdx * rows); } + // isPageAvailable() { return isRowAvailable() } + //return getUIData().getRowCount(); + return getRowCount(getDataTable()); + } + + public int getRows(UIData data) { + int row = 0; + row = data.getRows(); + if (row == 0) { + row = getRowCount(data); + } + + return row; + } + + // facet getter methods + public UIComponent getFirst() { + return getFacet(FIRST_FACET_NAME); + } + + public UIComponent getLast() { + return getFacet(LAST_FACET_NAME); + } + + public UIComponent getNext() { + return getFacet(NEXT_FACET_NAME); + } + + public UIComponent getFastForward() { + return getFacet(FAST_FORWARD_FACET_NAME); + } + + public UIComponent getFastRewind() { + return getFacet(FAST_REWIND_FACET_NAME); + } + + public UIComponent getPrevious() { + return getFacet(PREVIOUS_FACET_NAME); + } + + private transient Integer currentPageIndex; + private transient Integer currentPageCount; + + public Integer getCurrentPageCount(UIData dataTable) { + if (currentPageCount == null) { + currentPageCount = getPageCount(dataTable); + } + + return currentPageCount; + } + + public Integer getCurrentPageIndex(UIData dataTable) { + if (currentPageIndex == null) { + int pageCount = getCurrentPageCount(dataTable); + int pageIndex = getPageIndex(dataTable, pageCount); + + if (pageCount < 1) { + pageCount = 1; + } + + if (pageIndex < 1) { + pageIndex = 1; + + this.updateModel(pageIndex); + } else if (pageIndex > pageCount) { + pageIndex = pageCount; + + this.updateModel(pageIndex); + } + + currentPageIndex = pageIndex; + } + + return currentPageIndex; + } + + public int setupFirstRowValue() { + UIData dataTable = getDataTable(); + return (getCurrentPageIndex(dataTable) - 1) * getRows(dataTable); + } + + public void setPage(int newPage) { + this.pageNumber = newPage; + } + + public int getPage() { + if (this.pageNumber != null) { + return pageNumber; + } + + ValueExpression ve = getValueExpression("page"); + if (ve != null) { + try { + Integer pageObject = (Integer) ve.getValue(getFacesContext().getELContext()); + + if (pageObject != null) { + return pageObject; + } else { + return 1; + } + } catch (ELException e) { + throw new FacesException(e); + } + } else { + return 1; + } + } + + private void updateModel(int newPage) { + this.pageNumber = newPage; + FacesContext context = getFacesContext(); + ValueExpression ve = getValueExpression("page"); + if (ve != null) { + try { + ve.setValue(context.getELContext(), this.pageNumber); + this.pageNumber = null; + } catch (ELException e) { + String messageStr = e.getMessage(); + Throwable result = e.getCause(); + while (null != result && + result.getClass().isAssignableFrom(ELException.class)) { + messageStr = result.getMessage(); + result = result.getCause(); + } + FacesMessage message; + if (null == messageStr) { + message = + MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, + new Object[] { MessageUtil.getLabel( + context, this) }); + } else { + message = new FacesMessage(FacesMessage.SEVERITY_ERROR, + messageStr, + messageStr); + } + context.getExternalContext().log(message.getSummary(), result); + context.addMessage(getClientId(context), message); + context.renderResponse(); + } catch (IllegalArgumentException e) { + FacesMessage message = + MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, + new Object[] { MessageUtil.getLabel( + context, this) }); + context.getExternalContext().log(message.getSummary(), e); + context.addMessage(getClientId(context), message); + context.renderResponse(); + } catch (Exception e) { + FacesMessage message = + MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, + new Object[] { MessageUtil.getLabel( + context, this) }); + context.getExternalContext().log(message.getSummary(), e); + context.addMessage(getClientId(context), message); + context.renderResponse(); + } + } + } + + public String getFamily() { + return COMPONENT_FAMILY; + } + + static class BinarySearch { + + public static int search(UIData data) { + int rowIndex = data.getRowIndex(); + try { + int n = 1; + int k = 2; + for (; ;) { + data.setRowIndex(k - 1); + if (data.isRowAvailable()) { + n = k; + k = k * 2; + } else { + break; + } + } + + while (n < k) { + int kk = Math.round((n + k) / 2) + 1; + data.setRowIndex(kk - 1); + if (data.isRowAvailable()) { + n = kk; + } else { + k = kk - 1; + } + } + + data.setRowIndex(k - 1); + if (data.isRowAvailable()) { + return k; + } else { + return 0; + } + } finally { + data.setRowIndex(rowIndex); + } + } + } + + public Object saveState(FacesContext context) { + return new Object[] { + super.saveState(context), + pageNumber + }; + + } + + public void restoreState(FacesContext context, Object object) { + Object[] state = (Object[]) object; + + super.restoreState(context, state[0]); + pageNumber = (Integer) state[1]; + } + +} Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -48,28 +48,33 @@ } public void doDecode(FacesContext context, UIComponent component) { - UIDatascroller scroller = (UIDatascroller) component; - if (scroller.getPageCount() > 1) { - String param = (String) getParamMap(context).get( - component.getClientId(context)); - if (param != null) { - DataScrollerEvent event = new DataScrollerEvent(scroller, - String.valueOf(scroller.getPageIndex()), param); - if (scroller.isImmediate()) { - event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); - } else { - event.setPhaseId(PhaseId.INVOKE_APPLICATION); + String param = (String) getParamMap(context).get( + component.getClientId(context)); + if (param != null) { + UIDatascroller scroller = (UIDatascroller) component; + UIData data = scroller.getDataTable(); + int pageCount = scroller.getPageCount(data); + + if (pageCount > 1) { + int pageIndex = scroller.getPageIndex(data, pageCount); + int newPage = scroller.getPageForFacet(param, pageIndex, pageCount); + if (newPage > 0) { + DataScrollerEvent event = new DataScrollerEvent(scroller, + String.valueOf(pageIndex), param, newPage); + if (scroller.isImmediate()) { + event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); + } else { + event.setPhaseId(PhaseId.INVOKE_APPLICATION); + } + + component.queueEvent(event); } - - component.queueEvent(event); } } } public ControlsState getControlsState(FacesContext context, - UIDatascroller datascroller, UIData dataTable) { - int pageIndex = datascroller.getPageIndex(dataTable); - int pageCount = datascroller.getPageCount(dataTable); + UIDatascroller datascroller, int pageIndex, int pageCount) { int minPageIdx = 1; int maxPageIdx = pageCount; int fastStep = datascroller.getFastStep(); @@ -156,17 +161,18 @@ return controlsState; } - public void renderPager(FacesContext context, UIComponent component, UIData data) + public void renderPager(FacesContext context, UIComponent component, int pageIndex, int count) throws IOException { ResponseWriter out = context.getResponseWriter(); UIDatascroller scroller = (UIDatascroller) component; - int currentPage = scroller.getPageIndex(data); + int currentPage = pageIndex; int maxPages = scroller.getMaxPages(); if (maxPages <= 1) { maxPages = 1; } - int pageCount = scroller.getPageCount(data); + + int pageCount = count; if (pageCount <= 1) { return; } @@ -221,12 +227,12 @@ } - public void renderPages(FacesContext context, UIComponent component, UIData data) + public void renderPages(FacesContext context, UIComponent component, int pageIndex, int count) throws IOException { UIDatascroller scroller = (UIDatascroller) component; - int currentPage = scroller.getPageIndex(data); + int currentPage = pageIndex; - int pageCount = scroller.getPageCount(data); + int pageCount = count; if (pageCount <= 1) { pageCount = 1; } Added: trunk/ui/datascroller/src/main/java/org/richfaces/taglib/DatascrollerTagHandlerBase.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/taglib/DatascrollerTagHandlerBase.java (rev 0) +++ trunk/ui/datascroller/src/main/java/org/richfaces/taglib/DatascrollerTagHandlerBase.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -0,0 +1,93 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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-1301 USA + */ + +package org.richfaces.taglib; + +import javax.el.ValueExpression; + +import org.richfaces.component.UIDatascroller; + +import com.sun.facelets.FaceletContext; +import com.sun.facelets.tag.MetaRule; +import com.sun.facelets.tag.MetaRuleset; +import com.sun.facelets.tag.Metadata; +import com.sun.facelets.tag.MetadataTarget; +import com.sun.facelets.tag.TagAttribute; +import com.sun.facelets.tag.jsf.ComponentConfig; +import com.sun.facelets.tag.jsf.ComponentHandler; + +/** + * Created 11.03.2008 + * @author Nick Belaevski + * @since 3.2 + */ + +public class DatascrollerTagHandlerBase extends ComponentHandler { + + private static final MetaRule pageRule = new MetaRule() { + + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if ("page".equals(name)) { + return new PageMapper(attribute); + } else { + return null; + } + } + + }; + + private static final class PageMapper extends Metadata { + + private final TagAttribute page; + + /** + * @param attribute + */ + public PageMapper(TagAttribute attribute) { + page = attribute; + } + + /* (non-Javadoc) + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + UIDatascroller datascroller = (UIDatascroller) instance; + ValueExpression ve = page.getValueExpression(ctx, int.class); + if (ve.isLiteralText()) { + Integer value = (Integer) ve.getValue(ctx.getFacesContext().getELContext()); + datascroller.setPage(value); + } else { + datascroller.setValueExpression("page", ve); + } + } + + } + + public DatascrollerTagHandlerBase(ComponentConfig config) { + super(config); + } + + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset ruleset = super.createMetaRuleset(type); + ruleset.addRule(pageRule); + return ruleset; + } +} Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-03-11 18:44:41 UTC (rev 6726) @@ -32,7 +32,8 @@ maxPages = 1; } - int pageCount = component.getPageCount(dataTable); + int pageCount = component.getCurrentPageCount(dataTable); + int pageIndex = component.getCurrentPageIndex(dataTable); boolean singlePageRender = true; @@ -60,7 +61,7 @@ <tr> <jsp:scriptlet><![CDATA[ String facet; - org.richfaces.renderkit.html.ControlsState controlsState = getControlsState(context, component, dataTable); + org.richfaces.renderkit.html.ControlsState controlsState = getControlsState(context, component, pageIndex, pageCount); if (controlsState.isFirstRendered()){ if (controlsState.isFirstEnabled()){ @@ -193,7 +194,7 @@ ]]></jsp:scriptlet> <jsp:scriptlet><![CDATA[ - renderPages(context,component,dataTable); + renderPages(context, component, pageIndex, pageCount); UIComponent pagesFacet = component.getFacet("pages"); if (pagesFacet !=null && pagesFacet.isRendered()) { ]]></jsp:scriptlet> @@ -204,7 +205,7 @@ </td> <jsp:scriptlet><![CDATA[ } else { - renderPager(context,component,dataTable); + renderPager(context, component, pageIndex, pageCount); } ]]></jsp:scriptlet> Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -426,33 +426,31 @@ assertEquals(4,scroller.getPageCount()); scroller.setPage("2"); scroller.setFastStep(2); - assertEquals(5,data.getFirst()); + assertEquals(5,scroller.setupFirstRowValue()); scroller.setPage("next"); - assertEquals(10,data.getFirst()); + assertEquals(10,scroller.setupFirstRowValue()); scroller.setPage("previous"); - assertEquals(5,data.getFirst()); + assertEquals(5,scroller.setupFirstRowValue()); scroller.setPage("fastforward"); - assertEquals(15,data.getFirst()); + assertEquals(15,scroller.setupFirstRowValue()); scroller.setPage("fastrewind"); - assertEquals(5,data.getFirst()); + assertEquals(5,scroller.setupFirstRowValue()); scroller.setPage("first"); - assertEquals(0,data.getFirst()); + assertEquals(0,scroller.setupFirstRowValue()); scroller.setPage("previous"); - assertEquals(0,data.getFirst()); + assertEquals(0,scroller.setupFirstRowValue()); scroller.setPage("fastrewind"); - assertEquals(0,data.getFirst()); + assertEquals(0,scroller.setupFirstRowValue()); scroller.setPage("last"); - assertEquals(15,data.getFirst()); + assertEquals(15,scroller.setupFirstRowValue()); scroller.setPage("next"); - assertEquals(15,data.getFirst()); + assertEquals(15,scroller.setupFirstRowValue()); scroller.setPage("fastforward"); - assertEquals(15,data.getFirst()); + assertEquals(15,scroller.setupFirstRowValue()); scroller.setPage("5"); - assertEquals(15,data.getFirst()); + assertEquals(15,scroller.setupFirstRowValue()); scroller.setPage("0"); - assertEquals(0,data.getFirst()); - data.setRows(0); - + assertEquals(0,scroller.setupFirstRowValue()); } public void testListener() throws Exception{ @@ -503,7 +501,7 @@ // } // }; - DataScrollerEvent event = new DataScrollerEvent( ((UIComponent) scroller), "1", "2" ); + DataScrollerEvent event = new DataScrollerEvent( ((UIComponent) scroller), "1", "2", 2); this.scroller.setScrollerListener(binding); this.scroller.broadcast(event); Modified: trunk/ui/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java 2008-03-11 18:44:27 UTC (rev 6725) +++ trunk/ui/datascroller/src/test/java/org/richfaces/event/DataScrollerEventTest.java 2008-03-11 18:44:41 UTC (rev 6726) @@ -52,7 +52,7 @@ super.setUp(); data = (UIData) application.createComponent(HtmlDataTable.COMPONENT_TYPE); - event = new DataScrollerEvent(data, "old", "new"); + event = new DataScrollerEvent(data, "old", "new", 1); result = false; }

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6725 - trunk/samples/datascroller-sample/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-03-11 14:44:27 -0400 (Tue, 11 Mar 2008) New Revision: 6725 Modified: trunk/samples/datascroller-sample/src/main/webapp/pages/index.jsp Log: http://jira.jboss.com/jira/browse/RF-1133 Modified: trunk/samples/datascroller-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/datascroller-sample/src/main/webapp/pages/index.jsp 2008-03-11 18:44:22 UTC (rev 6724) +++ trunk/samples/datascroller-sample/src/main/webapp/pages/index.jsp 2008-03-11 18:44:27 UTC (rev 6725) @@ -59,7 +59,7 @@ </f:facet> </h:column> <f:facet name="footer"> - <ds:datascroller for="master" reRender="actionCount, eventCount" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/> + <ds:datascroller page="-1" for="master" reRender="actionCount, eventCount" rendered="true" fastStep="2" actionListener="#{testBean.onAction}" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/> </f:facet> </h:dataTable>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6724 - trunk/framework/api/src/main/java/org/richfaces/event.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-03-11 14:44:22 -0400 (Tue, 11 Mar 2008) New Revision: 6724 Modified: trunk/framework/api/src/main/java/org/richfaces/event/DataScrollerEvent.java Log: http://jira.jboss.com/jira/browse/RF-1133 Modified: trunk/framework/api/src/main/java/org/richfaces/event/DataScrollerEvent.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DataScrollerEvent.java 2008-03-11 18:34:59 UTC (rev 6723) +++ trunk/framework/api/src/main/java/org/richfaces/event/DataScrollerEvent.java 2008-03-11 18:44:22 UTC (rev 6724) @@ -31,11 +31,12 @@ public class DataScrollerEvent extends ActionEvent { /** - * - */ - private static final long serialVersionUID = 2657353903701932561L; - private String oldScrolVal; + * + */ + private static final long serialVersionUID = 2657353903701932561L; + private String oldScrolVal; private String newScrolVal; + private int page; /** * Creates a new ScrollerEvent. @@ -44,10 +45,11 @@ * @param thisOldScrolVal the previously showing item identifier * @param thisNewScrolVal the currently showing item identifier */ - public DataScrollerEvent(UIComponent component, String thisOldScrolVal, String thisNewScrolVal) { + public DataScrollerEvent(UIComponent component, String thisOldScrolVal, String thisNewScrolVal, int page) { super(component); oldScrolVal = thisOldScrolVal; newScrolVal = thisNewScrolVal; + this.page = page; } public String getOldScrolVal() { @@ -58,6 +60,14 @@ return newScrolVal; } + /** + * @since 3.2 + * @return new page or <code>-1</code> if not applicable + */ + public int getPage() { + return page; + } + public boolean isAppropriateListener(FacesListener listener){ return super.isAppropriateListener(listener) || (listener instanceof DataScrollerListener); }

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6723 - trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2008-03-11 14:34:59 -0400 (Tue, 11 Mar 2008) New Revision: 6723 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js Log: http://jira.jboss.com/jira/browse/RF-1484 Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2008-03-11 18:25:18 UTC (rev 6722) +++ trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2008-03-11 18:34:59 UTC (rev 6723) @@ -120,6 +120,8 @@ if (this.type=="node") this.tdhider.style.display=""; } + + this.tdhider.component = this; }, collapse: function(){ @@ -395,6 +397,14 @@ Event.observe(this.tablehider, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); } + }, + + doCollapse: function(e) { + PanelMenu.doCollapse(this.itemId); + }, + + doExpand: function(e) { + PanelMenu.doExpand(this.itemId); } };

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6722 - trunk/ui/inplaceSelect/src/main/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-03-11 14:25:18 -0400 (Tue, 11 Mar 2008) New Revision: 6722 Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: fix tabindex Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-03-11 18:23:04 UTC (rev 6721) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-03-11 18:25:18 UTC (rev 6722) @@ -82,14 +82,13 @@ <jsp:scriptlet> } </jsp:scriptlet> - <input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" /> + <input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" tabindex='#{component.attributes["tabindex"]}' /> <input id="#{clientId}inplaceTmpValue" type="text" style='display:none;' value="#{fieldValue}" autocomplete="off" maxlength='#{component.attributes["inputMaxLength"]}' - tabindex='#{component.attributes["tabindex"]}' readonly="readonly" class="rich-inplace-select-field"/> <input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6721 - trunk/ui/inplaceInput/src/main/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-03-11 14:23:04 -0400 (Tue, 11 Mar 2008) New Revision: 6721 Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx Log: http://jira.jboss.com/jira/browse/RF-2440 Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx =================================================================== --- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-03-11 18:00:16 UTC (rev 6720) +++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-03-11 18:23:04 UTC (rev 6721) @@ -79,14 +79,13 @@ } </jsp:scriptlet> - <input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" /> + <input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" tabindex='#{component.attributes["tabindex"]}'/> <input id='#{clientId}tempValue' class='rich-inplace-field' style='display:none;' type='text' autocomplete="off" value='#{fieldValue}' - tabindex='#{component.attributes["tabindex"]}' onchange='#{component.attributes["onchange"]}' onselect='#{component.attributes["onselect"]}' onblur='#{component.attributes["onblur"]}'

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6720 - trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-03-11 14:00:16 -0400 (Tue, 11 Mar 2008) New Revision: 6720 Modified: trunk/pom.xml Log: add reporting Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-03-11 17:59:49 UTC (rev 6719) +++ trunk/pom.xml 2008-03-11 18:00:16 UTC (rev 6720) @@ -254,4 +254,26 @@ </reporting> </profile> </profiles> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> + <configuration> + <configLocation>src/main/reports/exadel-checks.xml</configLocation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.3</version> + <configuration> + <rulesets> + <ruleset>src/main/reports/PMDExadelRuleSet.xml</ruleset> + </rulesets> + </configuration> + </plugin> + </plugins> + </reporting> </project>

16 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r6719 - in trunk: src and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-03-11 13:59:49 -0400 (Tue, 11 Mar 2008) New Revision: 6719 Added: trunk/src/ trunk/src/main/ trunk/src/main/reports/ trunk/src/main/reports/PMDExadelRuleSet.xml trunk/src/main/reports/exadel-checks.xml Log: add reporting Added: trunk/src/main/reports/PMDExadelRuleSet.xml =================================================================== --- trunk/src/main/reports/PMDExadelRuleSet.xml (rev 0) +++ trunk/src/main/reports/PMDExadelRuleSet.xml 2008-03-11 17:59:49 UTC (rev 6719) @@ -0,0 +1,125 @@ +<?xml version="1.0"?> + +<ruleset name="exadelruleset" + xmlns="http://pmd.sf.net/ruleset/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" + xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"> + + <rule ref="rulesets/basic.xml/EmptyCatchBlock"> + <properties> + <property name="allowCommentedBlocks" value="true"/> + </properties> + </rule> + <rule ref="rulesets/basic.xml/EmptyIfStmt"/> + <rule ref="rulesets/basic.xml/EmptyWhileStmt"/> + <rule ref="rulesets/basic.xml/EmptyTryBlock"/> + <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/> + <rule ref="rulesets/basic.xml/EmptySwitchStatements"/> + <rule ref="rulesets/basic.xml/JumbledIncrementer"/> + <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/> + <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/> + <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/> + <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/> + <rule ref="rulesets/basic.xml/UnnecessaryReturn"/> + <rule ref="rulesets/basic.xml/EmptyStaticInitializer"/> + <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/> + <rule ref="rulesets/basic.xml/BooleanInstantiation"/> + <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/> + <rule ref="rulesets/basic.xml/UselessOverridingMethod"/> + <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/> + <rule ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/> + <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/> + <rule ref="rulesets/basic.xml/MisplacedNullCheck"/> + <rule ref="rulesets/basic.xml/UnusedNullCheckInEquals"/> + <rule ref="rulesets/basic.xml/BrokenNullCheck"/> + <rule ref="rulesets/basic.xml/BigIntegerInstantiation"/> + + <rule ref="rulesets/clone.xml/ProperCloneImplementation"/> + <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/> + <rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/> + + <rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/> + <rule ref="rulesets/controversial.xml/UnusedModifier"/> + <rule ref="rulesets/controversial.xml/AssignmentInOperand"/> +  +  + + <rule ref="rulesets/coupling.xml/LooseCoupling"/> + + <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/> + <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/> +  + <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/> + <rule ref="rulesets/design.xml/AccessorClassGeneration"/> + <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/> + <rule ref="rulesets/design.xml/CloseResource"/> + <rule ref="rulesets/design.xml/OptimizableToArrayCall"/> + <rule ref="rulesets/design.xml/BadComparison"/> + <rule ref="rulesets/design.xml/EqualsNull"/> + <rule ref="rulesets/design.xml/InstantiationToGetClass"/> + <rule ref="rulesets/design.xml/IdempotentOperations"/> + <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/> + <rule ref="rulesets/design.xml/ImmutableField"/> + <rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/> + <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/> + <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/> + <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/> +  + <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/> + <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/> + <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/> + <rule ref="rulesets/design.xml/SimplifyConditional"/> + <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/> + <rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/> + <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/> +  + <rule ref="rulesets/design.xml/UncommentedEmptyMethod"/> + <rule ref="rulesets/design.xml/UncommentedEmptyConstructor"/> + <rule ref="rulesets/design.xml/AvoidConstantsInterface"/> + <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/> + <rule ref="rulesets/design.xml/PreserveStackTrace"/> + <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/> + + <rule ref="rulesets/finalizers.xml"/> + + <rule ref="rulesets/imports.xml"/> + + <rule ref="rulesets/j2ee.xml"/> + + <rule ref="rulesets/javabeans.xml"> + <exclude name="BeanMembersShouldSerialize"/> + </rule> + + <rule ref="rulesets/junit.xml"/> + + <rule ref="rulesets/logging-java.xml/SystemPrintln"/> + <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/> + + <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/> + + <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/> + <rule ref="rulesets/optimizations.xml/UseArraysAsList"/> + <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/> + <rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/> + <rule ref="rulesets/optimizations.xml/AddEmptyString"/> + + <rule ref="rulesets/strictexception.xml"> + <exclude name="AvoidThrowingRawExceptionTypes"/> + </rule> + + <rule ref="rulesets/strings.xml"> + <exclude name="InsufficientStringBufferDeclaration"/> + <exclude name="AvoidDuplicateLiterals"/> + </rule> + + <rule ref="rulesets/sunsecure.xml"/> + + <rule ref="rulesets/unusedcode.xml"/> + + <rule ref="rulesets/migrating.xml/IntegerInstantiation"/> + <rule ref="rulesets/migrating.xml/ByteInstantiation"/> + <rule ref="rulesets/migrating.xml/ShortInstantiation"/> + <rule ref="rulesets/migrating.xml/LongInstantiation"/> + +</ruleset> Added: trunk/src/main/reports/exadel-checks.xml =================================================================== --- trunk/src/main/reports/exadel-checks.xml (rev 0) +++ trunk/src/main/reports/exadel-checks.xml 2008-03-11 17:59:49 UTC (rev 6719) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> +<module name="Checker"> + <property name="severity" value="warning"/> + <module name="TreeWalker"> + <module name="JavadocMethod"> + <property name="scope" value="public"/> + </module> + <module name="JavadocType"/> + <module name="JavadocVariable"> + <property name="scope" value="public"/> + </module> + <module name="JavadocStyle"> + <property name="checkEmptyJavadoc" value="true"/> + <property name="checkFirstSentence" value="false"/> + </module> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="StaticVariableName"/> + <module name="TypeName"/> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="FileLength"/> + <module name="EmptyForIteratorPad"/> + <module name="MethodParamPad"/> + <module name="NoWhitespaceAfter"/> + <module name="NoWhitespaceBefore"/> + <module name="OperatorWrap"/> + <module name="ParenPad"/> + <module name="TypecastParenPad"> + <property name="tokens" value="RPAREN,TYPECAST"/> + </module> + <module name="WhitespaceAfter"/> + <module name="WhitespaceAround"> + <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/> + </module> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + <module name="AvoidNestedBlocks"/> + <module name="EmptyBlock"/> + <module name="LeftCurly"> + <property name="maxLineLength" value="1000"/> + </module> + <module name="NeedBraces"/> + <module name="RightCurly"/> + <module name="EmptyStatement"/> + <module name="InnerAssignment"/> + <module name="MagicNumber"> + <property name="ignoreNumbers" value="-1, 0, 1"/> + </module> + <module name="MissingSwitchDefault"/> + <module name="RedundantThrows"> + </module> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + <module name="InterfaceIsType"/> + <module name="VisibilityModifier"> + <property name="packageAllowed" value="true"/> + <property name="protectedAllowed" value="true"/> + </module> + <module name="ArrayTypeStyle"/> + <module name="UpperEll"/> + <module name="ParameterName"/> + <module name="DeclarationOrder"/> + <module name="FallThrough"/> + <module name="HiddenField"> + <property name="tokens" value="VARIABLE_DEF"/> + </module> + <module name="MultipleVariableDeclarations"/> + <module name="Indentation"> + <property name="caseIndent" value="0"/> + </module> + </module> +</module>

16 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2008