richfaces-svn-commits
September 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 338 discussions
JBoss Rich Faces SVN: r19195 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-09-14 10:27:49 -0400 (Tue, 14 Sep 2010)
New Revision: 19195
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java
Log:
* fixed bug that was causing reinitialization of bean after each request
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-09-14 14:03:40 UTC (rev 19194)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JJSFunctionBean.java 2010-09-14 14:27:49 UTC (rev 19195)
@@ -27,7 +27,7 @@
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.faces.bean.SessionScoped;
import javax.faces.event.ActionEvent;
import org.richfaces.component.UIFunction;
@@ -42,7 +42,8 @@
* @version $Revision$
*/
@ManagedBean(name = "a4jJSFunctionBean")
-@ViewScoped
+// cannot be view-scoped (see https://jira.jboss.org/browse/RF-9287)
+@SessionScoped
public class A4JJSFunctionBean implements Serializable {
private static final long serialVersionUID = 48333649809L;
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19194 - in trunk/ui/iteration/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-09-14 10:03:40 -0400 (Tue, 14 Sep 2010)
New Revision: 19194
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss
Log:
https://jira.jboss.org/browse/RF-9295
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-09-14 13:26:21 UTC (rev 19193)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-09-14 14:03:40 UTC (rev 19194)
@@ -133,7 +133,7 @@
}
rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-t"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-trm"));
termFacet.encodeAll(context);
writer.endElement(HtmlConstants.DT_ELEMENT);
}
@@ -145,7 +145,7 @@
}
rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE,
- HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-d"));
+ HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-dfn"));
renderHandlers(context, sequence);
rendererUtils.encodeChildren(context, sequence);
writer.endElement(HtmlConstants.DD_ELEMENT);
@@ -191,9 +191,9 @@
}
- private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-i");
+ private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-itm");
- private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-i");
+ private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-itm");
private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder();
Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss
===================================================================
--- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-09-14 13:26:21 UTC (rev 19193)
+++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-09-14 14:03:40 UTC (rev 19194)
@@ -1,4 +1,4 @@
-.rf-ulst-i, .rf-olst-i, .rf-dlst-t, .rf-dlst-d {
+.rf-ulst-itm, .rf-olst-itm, .rf-dlst-trm, .rf-dlst-dfn {
font-size: '#{richSkin.generalSizeFont}';
font-family: '#{richSkin.generalFamilyFont}';
color: '#{richSkin.generalTextColor}';
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19193 - in modules/tests/metamer/trunk/application/src/main: resources/org/richfaces/tests/metamer/bean and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-09-14 09:26:21 -0400 (Tue, 14 Sep 2010)
New Revision: 19193
Added:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties
modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/
modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/list.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
Log:
https://jira.jboss.org/browse/RFPL-669
* autocomplete added to Metamer
Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java 2010-09-14 13:26:21 UTC (rev 19193)
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.ViewScoped;
+import org.richfaces.component.UIAutocomplete;
+
+import org.richfaces.tests.metamer.Attributes;
+import org.richfaces.tests.metamer.model.Capital;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Managed bean for rich:autocomplete.
+ * http://community.jboss.org/wiki/richfacesautocompletecomponentbehavior
+ *
+ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
+ * @version $Revision$
+ */
+@ManagedBean(name = "richAutocompleteBean")
+@ViewScoped
+public class RichAutocompleteBean implements Serializable {
+
+ private static final long serialVersionUID = -1L;
+ private static Logger logger;
+ private Attributes attributes;
+ @ManagedProperty(value = "#{model.capitals}")
+ private List<Capital> capitals;
+
+ /**
+ * Initializes the managed bean.
+ */
+ @PostConstruct
+ public void init() {
+ logger = LoggerFactory.getLogger(getClass());
+ logger.debug("initializing bean " + getClass().getName());
+
+ attributes = Attributes.getUIComponentAttributes(UIAutocomplete.class, getClass());
+ attributes.setAttribute("mode", "cachedAjax");
+ attributes.setAttribute("rendered", true);
+
+
+ attributes.remove("autocompleteMethod");
+ attributes.remove("converter");
+ attributes.remove("itemConverter");
+
+ // these are hidden attributes
+ attributes.remove("autocompleteList");
+ attributes.remove("localValue");
+ attributes.remove("localValueSet");
+ attributes.remove("submittedValue");
+ attributes.remove("valid");
+ attributes.remove("validators");
+ attributes.remove("valueChangeListeners");
+ }
+
+ public Attributes getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Attributes attributes) {
+ this.attributes = attributes;
+ }
+
+ public List<String> autocomplete(String prefix) {
+ ArrayList<String> result = new ArrayList<String>();
+ if (prefix.length() > 0) {
+ Iterator<Capital> iterator = capitals.iterator();
+ while (iterator.hasNext()) {
+ Capital elem = ((Capital) iterator.next());
+ if ((elem.getState() != null && elem.getState().toLowerCase().indexOf(prefix.toLowerCase()) == 0)
+ || "".equals(prefix)) {
+ result.add(elem.getState());
+ }
+ }
+ } else {
+ for (int i = 0; i < 10; i++) {
+ result.add(capitals.get(i).getState());
+ }
+ }
+ return result;
+ }
+
+ public void setCapitals(List<Capital> capitals) {
+ this.capitals = capitals;
+ }
+}
Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAutocompleteBean.java
___________________________________________________________________
Name: svn:keywords
+ Revision
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-09-14 13:24:47 UTC (rev 19192)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-09-14 13:26:21 UTC (rev 19193)
@@ -110,6 +110,7 @@
components.put("hDataTable", "JSF Data Table");
components.put("richAccordion", "Rich Accordion");
components.put("richAccordionItem", "Rich Accordion Item");
+ components.put("richAutocomplete", "Rich Autocomplete");
components.put("richColumn", "Rich Column");
components.put("richColumnGroup", "Rich Column Group");
components.put("richComponentControl", "Rich Component Control");
Added: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties
===================================================================
--- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAutocompleteBean.properties 2010-09-14 13:26:21 UTC (rev 19193)
@@ -0,0 +1,4 @@
+attr.mode.client=client
+attr.mode.ajax=ajax
+attr.mode.cachedAjax=cachedAjax
+attr.mode.none=
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2010-09-14 13:26:21 UTC (rev 19193)
@@ -0,0 +1,115 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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 software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <rich:autocomplete id="autocomplete"
+ autofill="#{richAutocompleteBean.attributes['autofill'].value}"
+ autocompleteMethod="#{richAutocompleteBean.autocomplete}"
+ clientFilter="#{richAutocompleteBean.attributes['clientFilter'].value}"
+ converterMessage="#{richAutocompleteBean.attributes['converterMessage'].value}"
+ disabled="#{richAutocompleteBean.attributes['disabled'].value}"
+ fetchValue="#{richAutocompleteBean.attributes['fetchValue'].value}"
+ filterFunction="#{richAutocompleteBean.attributes['filterFunction'].value}"
+ immediate="#{richAutocompleteBean.attributes['immediate'].value}"
+ layout="#{richAutocompleteBean.attributes['layout'].value}"
+ minChars="#{richAutocompleteBean.attributes['minChars'].value}"
+ mode="#{richAutocompleteBean.attributes['mode'].value}"
+ onbeforedomupdate="#{richAutocompleteBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{richAutocompleteBean.attributes['onbegin'].value}"
+ onblur="#{richAutocompleteBean.attributes['onblur'].value}"
+ onchange="#{richAutocompleteBean.attributes['onchange'].value}"
+ onclick="#{richAutocompleteBean.attributes['onclick'].value}"
+ oncomplete="#{richAutocompleteBean.attributes['oncomplete'].value}"
+ ondblclick="#{richAutocompleteBean.attributes['ondblclick'].value}"
+ onerror="#{richAutocompleteBean.attributes['onerror'].value}"
+ onfocus="#{richAutocompleteBean.attributes['onfocus'].value}"
+ onkeydown="#{richAutocompleteBean.attributes['onkeydown'].value}"
+ onkeypress="#{richAutocompleteBean.attributes['onkeypress'].value}"
+ onkeyup="#{richAutocompleteBean.attributes['onkeyup'].value}"
+ onlistblur="#{richAutocompleteBean.attributes['onlistblur'].value}"
+ onlistclick="#{richAutocompleteBean.attributes['onlistclick'].value}"
+ onlistdblclick="#{richAutocompleteBean.attributes['onlistdblclick'].value}"
+ onlistfocus="#{richAutocompleteBean.attributes['onlistfocus'].value}"
+ onlistkeydown="#{richAutocompleteBean.attributes['onlistkeydown'].value}"
+ onlistkeypress="#{richAutocompleteBean.attributes['onlistkeypress'].value}"
+ onlistkeyup="#{richAutocompleteBean.attributes['onlistkeyup'].value}"
+ onlistmousedown="#{richAutocompleteBean.attributes['onlistmousedown'].value}"
+ onlistmousemove="#{richAutocompleteBean.attributes['onlistmousemove'].value}"
+ onlistmouseout="#{richAutocompleteBean.attributes['onlistmouseout'].value}"
+ onlistmouseover="#{richAutocompleteBean.attributes['onlistmouseover'].value}"
+ onlistmouseup="#{richAutocompleteBean.attributes['onlistmouseup'].value}"
+ onmousedown="#{richAutocompleteBean.attributes['onmousedown'].value}"
+ onmousemove="#{richAutocompleteBean.attributes['onmousemove'].value}"
+ onmouseout="#{richAutocompleteBean.attributes['onmouseout'].value}"
+ onmouseover="#{richAutocompleteBean.attributes['onmouseover'].value}"
+ onmouseup="#{richAutocompleteBean.attributes['onmouseup'].value}"
+ rendered="#{richAutocompleteBean.attributes['rendered'].value}"
+ required="#{richAutocompleteBean.attributes['required'].value}"
+ requiredMessage="#{richAutocompleteBean.attributes['requiredMessage'].value}"
+ selectFirst="#{richAutocompleteBean.attributes['selectFirst'].value}"
+ selectItemClass="#{richAutocompleteBean.attributes['selectItemClass'].value}"
+ showButton="#{richAutocompleteBean.attributes['showButton'].value}"
+ tokens="#{richAutocompleteBean.attributes['tokens'].value}"
+ validator="#{richAutocompleteBean.attributes['validator'].value}"
+ validatorMessage="#{richAutocompleteBean.attributes['validatorMessage'].value}"
+ value="#{richAutocompleteBean.attributes['value'].value}"
+ valueChangeListener="#{richAutocompleteBean.attributes['valueChangeListener'].value}"
+ var="#{richAutocompleteBean.attributes['var'].value}"
+ >
+
+ <ui:remove>
+ <!-- TODO enable as soon as event "select" is implemented and add it to component above -->
+ <a4j:ajax id="autocompleteAjax" event="select" render="output"/>
+ </ui:remove>
+ </rich:autocomplete>
+
+ <br/><br/>
+ <a4j:outputPanel id="outputPanel" layout="block">
+ Your selection: <h:outputText id="output" value="#{richAutocompleteBean.attributes['value'].value}"/>
+ </a4j:outputPanel>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richAutocompleteBean.attributes}" id="attributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/list.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/list.xhtml 2010-09-14 13:26:21 UTC (rev 19193)
@@ -0,0 +1,42 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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 software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <ui:composition template="/templates/list.xhtml">
+
+ <ui:define name="pageTitle">Rich Autocomplete</ui:define>
+
+ <ui:define name="links">
+
+ <metamer:testPageLink id="autocomplete" outcome="autocomplete" value="Simple">
+ Simple page that contains <b>rich:autocomplete</b> (with model containing capitals) and
+ input boxes for all its attributes.
+ </metamer:testPageLink>
+
+ </ui:define>
+
+ </ui:composition>
+
+</html>
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19192 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-14 09:24:47 -0400 (Tue, 14 Sep 2010)
New Revision: 19192
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
Log:
a4j:queue tests refactored to introduce QueueModel (replaced QueueLocators) to easy reuse in other tests (RFPL-733)
Copied: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java (from rev 19188, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueLocators.java)
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java 2010-09-14 13:24:47 UTC (rev 19192)
@@ -0,0 +1,172 @@
+package org.richfaces.tests.metamer.ftest.a4jQueue;
+
+import static org.jboss.cheiron.retriever.RetrieverAdapter.integerAdapter;
+import static org.jboss.cheiron.retriever.RetrieverAdapter.longAdapter;
+import static org.jboss.test.selenium.SystemProperties.isSeleniumDebug;
+import static org.jboss.test.selenium.dom.Event.KEYPRESS;
+import static org.jboss.test.selenium.locator.Attribute.TITLE;
+import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref;
+import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
+import static org.jboss.test.selenium.waiting.retrievers.RetrieverFactory.RETRIEVE_ATTRIBUTE;
+import static org.jboss.test.selenium.waiting.retrievers.RetrieverFactory.RETRIEVE_TEXT;
+import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.jboss.test.selenium.waiting.WaitFactory.waitAjax;
+
+import org.jboss.test.selenium.framework.AjaxSelenium;
+import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
+import org.jboss.test.selenium.locator.AttributeLocator;
+import org.jboss.test.selenium.locator.ElementLocator;
+import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.locator.reference.LocatorReference;
+import org.jboss.test.selenium.locator.reference.ReferencedLocator;
+import org.jboss.test.selenium.waiting.retrievers.Retriever;
+
+public class QueueModel {
+
+ private AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
+
+ private Boolean event2Present = null;
+
+ int deviationTotal;
+ int deviationCount;
+
+ LocatorReference<JQueryLocator> form = new LocatorReference<JQueryLocator>(null);
+
+ ReferencedLocator<JQueryLocator> input1 = ref(form, "input:text[id$=input1]");
+ ReferencedLocator<JQueryLocator> input2 = ref(form, "input:text[id$=input2]");
+
+ ElementLocator<?> events1 = ref(form, "span[id$=events1]");
+ ElementLocator<?> events2 = ref(form, "span[id$=events2]");
+ ElementLocator<?> requests = ref(form, "span[id$=requests]");
+ ElementLocator<?> updates = ref(form, "span[id$=updates]");
+
+ AttributeLocator<?> event1Time = ref(form, "span[id$=eventTime1\\:outputTime]").getAttribute(TITLE);
+ AttributeLocator<?> event2Time = ref(form, "span[id$=eventTime2\\:outputTime]").getAttribute(TITLE);
+ AttributeLocator<?> beginTime = ref(form, "span[id$=beginTime\\:outputTime]").getAttribute(TITLE);
+ AttributeLocator<?> completeTime = ref(form, "span[id$=completeTime\\:outputTime]").getAttribute(TITLE);
+
+ Retriever<Integer> retrieveEvent1Count = integerAdapter(RETRIEVE_TEXT.locator(events1));
+ Retriever<Integer> retrieveEvent2Count = integerAdapter(RETRIEVE_TEXT.locator(events2));
+ Retriever<Integer> retrieveRequestCount = integerAdapter(RETRIEVE_TEXT.locator(requests));
+ Retriever<Integer> retrieveDOMUpdateCount = integerAdapter(RETRIEVE_TEXT.locator(updates));
+
+ Retriever<Long> retrieveEvent1Time = longAdapter(RETRIEVE_ATTRIBUTE.attributeLocator(event1Time));
+ Retriever<Long> retrieveEvent2Time = longAdapter(RETRIEVE_ATTRIBUTE.attributeLocator(event2Time));
+ Retriever<Long> retrieveBeginTime = longAdapter(RETRIEVE_ATTRIBUTE.attributeLocator(beginTime));
+ Retriever<Long> retrieveCompleteTime = longAdapter(RETRIEVE_ATTRIBUTE.attributeLocator(completeTime));
+
+ public QueueModel() {
+ this(pjq(""));
+ }
+
+ public QueueModel(JQueryLocator queueRoot) {
+ form.setLocator(queueRoot);
+ }
+
+ private boolean isEvent2Present() {
+ if (event2Present == null) {
+ event2Present = selenium.isElementPresent(input2);
+ assertEquals((boolean) event2Present, selenium.isElementPresent(event2Time.getAssociatedElement()));
+ }
+ return event2Present;
+ }
+
+ public void fireEvent(int countOfEvents) {
+ fireEvent(Input.FIRST, countOfEvents);
+ }
+
+ public void fireEvent(Input event, int countOfEvents) {
+ ElementLocator<?> input = (event == Input.FIRST) ? input1 : input2;
+ for (int i = 0; i < countOfEvents; i++) {
+ selenium.fireEvent(input, KEYPRESS);
+ }
+ }
+
+ public void initializeCounts() {
+ retrieveEvent1Count.initializeValue();
+ retrieveRequestCount.initializeValue();
+ retrieveDOMUpdateCount.initializeValue();
+ if (isEvent2Present()) {
+ retrieveEvent2Count.initializeValue();
+ }
+ }
+
+ public void checkCounts(int events1, int requests, int domUpdates) {
+ assertChangeIfNotEqualToOldValue(retrieveEvent1Count, events1, "event1Count");
+ assertChangeIfNotEqualToOldValue(retrieveRequestCount, requests, "requestCount");
+ assertChangeIfNotEqualToOldValue(retrieveDOMUpdateCount, domUpdates, "domUpdates");
+ }
+
+ public void checkCounts(int events1, int events2, int requests, int domUpdates) {
+ assertChangeIfNotEqualToOldValue(retrieveEvent1Count, events1, "event1Count");
+
+ assertChangeIfNotEqualToOldValue(retrieveRequestCount, requests, "requestCount");
+ assertChangeIfNotEqualToOldValue(retrieveDOMUpdateCount, domUpdates, "domUpdates");
+ if (isEvent2Present()) {
+ assertChangeIfNotEqualToOldValue(retrieveEvent2Count, events2, "event2Count");
+ }
+ }
+
+ private void assertChangeIfNotEqualToOldValue(Retriever<Integer> retrieveCount, Integer eventCount, String eventType) {
+ if (!eventCount.equals(retrieveCount.getValue())) {
+ assertEquals(waitAjax.failWith(eventType).waitForChangeAndReturn(retrieveCount), eventCount);
+ } else {
+ assertEquals(retrieveCount.retrieve(), eventCount);
+ }
+ }
+
+ public void initializeTimes() {
+ deviationTotal = 0;
+ deviationCount = 0;
+ retrieveEvent1Time.initializeValue();
+ retrieveBeginTime.initializeValue();
+ retrieveCompleteTime.initializeValue();
+ if (isEvent2Present()) {
+ retrieveEvent2Time.initializeValue();
+ }
+ }
+
+ public void checkTimes(long requestDelay) {
+ checkTimes(Input.FIRST, requestDelay);
+ }
+
+ public void checkTimes(Input event, long requestDelay) {
+ Retriever<Long> retrieveEventTime = (event == Input.FIRST) ? retrieveEvent1Time : retrieveEvent2Time;
+ long eventTime = waitAjax.waitForChangeAndReturn(retrieveEventTime);
+ long beginTime = waitAjax.waitForChangeAndReturn(retrieveBeginTime);
+ long actualDelay = beginTime - eventTime;
+ long deviation = Math.abs(actualDelay - requestDelay);
+ long maxDeviation = Math.max(100, requestDelay);
+
+ if (isSeleniumDebug()) {
+ System.out.println(format("deviation for requestDelay {0}: {1}", requestDelay, deviation));
+ }
+
+ assertTrue(
+ deviation <= maxDeviation,
+ format("Deviation ({0}) is greater than maxDeviation ({1}) for requestDelay {2}", deviation, maxDeviation,
+ requestDelay));
+
+ deviationTotal += deviation;
+ deviationCount += 1;
+ }
+
+ public void checkAvgDeviation(long requestDelay) {
+ long maximumAvgDeviation = Math.max(25, Math.min(50, requestDelay / 4));
+ long averageDeviation = deviationTotal / deviationCount;
+ if (isSeleniumDebug()) {
+ System.out.println("averageDeviation: " + averageDeviation);
+ }
+ assertTrue(
+ averageDeviation <= maximumAvgDeviation,
+ format(
+ "Average deviation for all tests of requestDelay ({0}) should not be greater than defined maximum {1}",
+ averageDeviation, maximumAvgDeviation));
+ }
+
+ public static enum Input {
+ FIRST, SECOND;
+ }
+}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java 2010-09-14 11:19:55 UTC (rev 19191)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java 2010-09-14 13:24:47 UTC (rev 19192)
@@ -21,19 +21,14 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jQueue;
-import static org.jboss.test.selenium.dom.Event.KEYPRESS;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
-import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
-import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
-import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import java.net.URL;
import org.jboss.cheiron.halt.XHRHalter;
-import org.jboss.test.selenium.locator.ElementLocator;
-import org.jboss.test.selenium.waiting.retrievers.Retriever;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel.Input;
import org.testng.annotations.Test;
/**
@@ -46,18 +41,22 @@
static final Long DELAY_A = 3000L;
static final Long DELAY_B = 5000L;
- int deviationTotal;
- int deviationCount;
+ QueueModel queueA = prepareLocators("formQueue1");
+ QueueModel queueB = prepareLocators("formQueue2");
+ QueueModel globalQueue = prepareLocators("globalQueue");
- QueueLocators formQueueA = prepareLocators("formQueue1");
- QueueLocators formQueueB = prepareLocators("formQueue2");
- QueueLocators globalQueue = prepareLocators("globalQueue");
+ QueueAttributes attributesQueueA = prepareAttributes("formQueue1");
+ QueueAttributes attributesQueueB = prepareAttributes("formQueue2");
+ QueueAttributes attributesGlobalQueue = prepareAttributes("globalQueue");
- private static QueueLocators prepareLocators(String identifier) {
- return new QueueLocators(identifier, pjq("div.rf-p[id$={0}Panel]").format(identifier), pjq(
- "div.rf-p[id$={0}AttributesPanel]").format(identifier));
+ private static QueueModel prepareLocators(String identifier) {
+ return new QueueModel(pjq("div.rf-p[id$={0}Panel]").format(identifier));
}
+ private static QueueAttributes prepareAttributes(String identifier) {
+ return new QueueAttributes(pjq("div.rf-p[id$={0}AttributesPanel]").format(identifier));
+ }
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/a4jQueue/formQueue.xhtml");
@@ -78,22 +77,22 @@
*/
@Test
public void testTimingOneQueueTwoEvents() {
- formQueueA.attributes.setRequestDelay(DELAY_A);
- globalQueue.attributes.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.setRequestDelay(DELAY_A);
+ attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
- initializeTimes(formQueueA);
+ queueA.initializeTimes();
XHRHalter.enable();
- fireEvent(formQueueA, Event.FIRST, 2);
- fireEvent(formQueueA, Event.SECOND, 3);
+ queueA.fireEvent(Input.FIRST, 2);
+ queueA.fireEvent(Input.SECOND, 3);
XHRHalter halter = XHRHalter.getHandleBlocking();
halter.complete();
halter.waitForOpen();
halter.complete();
- checkTimes(formQueueA, Event.SECOND, DELAY_A);
+ queueA.checkTimes(Input.SECOND, DELAY_A);
}
/**
@@ -111,26 +110,26 @@
*/
@Test
public void testCountsOneQueueTwoEvents() {
- formQueueA.attributes.setRequestDelay(DELAY_A);
- globalQueue.attributes.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.setRequestDelay(DELAY_A);
+ attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
- initializeCounts(formQueueA);
+ queueA.initializeCounts();
XHRHalter.enable();
- fireEvent(formQueueA, Event.FIRST, 2);
- checkCounts(formQueueA, 2, 0, 0, 0);
- fireEvent(formQueueA, Event.SECOND, 3);
- checkCounts(formQueueA, 2, 3, 1, 0);
+ queueA.fireEvent(Input.FIRST, 2);
+ queueA.checkCounts(2, 0, 0, 0);
+ queueA.fireEvent(Input.SECOND, 3);
+ queueA.checkCounts(2, 3, 1, 0);
XHRHalter halter = XHRHalter.getHandleBlocking();
- checkCounts(formQueueA, 2, 3, 1, 0);
+ queueA.checkCounts(2, 3, 1, 0);
halter.complete();
- checkCounts(formQueueA, 2, 3, 2, 1);
+ queueA.checkCounts(2, 3, 2, 1);
halter.waitForOpen();
- checkCounts(formQueueA, 2, 3, 2, 1);
+ queueA.checkCounts(2, 3, 2, 1);
halter.complete();
- checkCounts(formQueueA, 2, 3, 2, 2);
+ queueA.checkCounts(2, 3, 2, 2);
}
/**
@@ -149,19 +148,19 @@
*/
@Test
public void testTimingTwoQueuesFourEvents() {
- formQueueA.attributes.setRequestDelay(DELAY_A);
- formQueueB.attributes.setRequestDelay(DELAY_B);
- globalQueue.attributes.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.setRequestDelay(DELAY_A);
+ attributesQueueB.setRequestDelay(DELAY_B);
+ attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
- initializeTimes(formQueueA);
- initializeTimes(formQueueB);
+ queueA.initializeTimes();
+ queueB.initializeTimes();
XHRHalter.enable();
- fireEvent(formQueueA, Event.FIRST, 1);
- fireEvent(formQueueA, Event.SECOND, 1);
- fireEvent(formQueueB, Event.FIRST, 1);
- fireEvent(formQueueB, Event.SECOND, 1);
+ queueA.fireEvent(Input.FIRST, 1);
+ queueA.fireEvent(Input.SECOND, 1);
+ queueB.fireEvent(Input.FIRST, 1);
+ queueB.fireEvent(Input.SECOND, 1);
XHRHalter halter = XHRHalter.getHandleBlocking();
halter.complete();
@@ -172,11 +171,11 @@
halter.waitForOpen();
halter.complete();
- checkTimes(formQueueB, Event.SECOND, DELAY_B);
+ queueB.checkTimes(Input.SECOND, DELAY_B);
- assertTrue(formQueueA.retrieveBeginTime.retrieve() - formQueueA.retrieveEvent1Time.retrieve() < 1000);
- assertTrue(formQueueA.retrieveBeginTime.retrieve() - formQueueA.retrieveEvent2Time.retrieve() < 1000);
- assertTrue(formQueueB.retrieveBeginTime.retrieve() - formQueueB.retrieveEvent1Time.retrieve() > 3000);
+ assertTrue(queueA.retrieveBeginTime.retrieve() - queueA.retrieveEvent1Time.retrieve() < 1000);
+ assertTrue(queueA.retrieveBeginTime.retrieve() - queueA.retrieveEvent2Time.retrieve() < 1000);
+ assertTrue(queueB.retrieveBeginTime.retrieve() - queueB.retrieveEvent1Time.retrieve() > 3000);
}
/**
@@ -194,104 +193,41 @@
*/
@Test
public void testCountsTwoQueuesThreeEvents() {
- formQueueA.attributes.setRequestDelay(DELAY_A);
- formQueueB.attributes.setRequestDelay(DELAY_B);
- globalQueue.attributes.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.setRequestDelay(DELAY_A);
+ attributesQueueB.setRequestDelay(DELAY_B);
+ attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
- initializeCounts(formQueueA);
- initializeCounts(formQueueB);
+ queueA.initializeCounts();
+ queueB.initializeCounts();
XHRHalter.enable();
- fireEvent(formQueueA, Event.FIRST, 1);
- checkCounts(formQueueA, 1, 0, 0, 0);
- fireEvent(formQueueA, Event.SECOND, 1);
- checkCounts(formQueueA, 1, 1, 1, 0);
- fireEvent(formQueueB, Event.FIRST, 1);
- checkCounts(formQueueB, 1, 0, 0, 0);
- fireEvent(formQueueB, Event.SECOND, 1);
+ queueA.fireEvent(Input.FIRST, 1);
+ queueA.checkCounts(1, 0, 0, 0);
+ queueA.fireEvent(Input.SECOND, 1);
+ queueA.checkCounts(1, 1, 1, 0);
+ queueB.fireEvent(Input.FIRST, 1);
+ queueB.checkCounts(1, 0, 0, 0);
+ queueB.fireEvent(Input.SECOND, 1);
- checkCounts(formQueueA, 1, 1, 1, 0);
- checkCounts(formQueueB, 1, 1, 0, 0);
+ queueA.checkCounts(1, 1, 1, 0);
+ queueB.checkCounts(1, 1, 0, 0);
XHRHalter halter = XHRHalter.getHandleBlocking();
halter.complete();
- checkCounts(formQueueA, 1, 1, 2, 1);
+ queueA.checkCounts(1, 1, 2, 1);
halter.waitForOpen();
halter.complete();
- checkCounts(formQueueA, 1, 1, 2, 2);
- checkCounts(formQueueB, 1, 1, 1, 0);
+ queueA.checkCounts(1, 1, 2, 2);
+ queueB.checkCounts(1, 1, 1, 0);
halter.waitForOpen();
halter.complete();
halter.waitForOpen();
- checkCounts(formQueueB, 1, 1, 2, 1);
+ queueB.checkCounts(1, 1, 2, 1);
halter.complete();
- checkCounts(formQueueA, 1, 1, 2, 2);
- checkCounts(formQueueB, 1, 1, 2, 2);
+ queueA.checkCounts(1, 1, 2, 2);
+ queueB.checkCounts(1, 1, 2, 2);
}
- private void initializeTimes(QueueLocators formQueueLocators) {
- deviationTotal = 0;
- deviationCount = 0;
- formQueueLocators.retrieveEvent1Time.initializeValue();
- formQueueLocators.retrieveEvent2Time.initializeValue();
- formQueueLocators.retrieveBeginTime.initializeValue();
- formQueueLocators.retrieveCompleteTime.initializeValue();
- }
-
- private void fireEvent(QueueLocators formQueueLocators, Event event, int countOfEvents) {
- ElementLocator<?> input = (event == Event.FIRST) ? formQueueLocators.input1 : formQueueLocators.input2;
- for (int i = 0; i < countOfEvents; i++) {
- selenium.fireEvent(input, KEYPRESS);
- }
- }
-
- private void initializeCounts(QueueLocators formQueueLocators) {
- formQueueLocators.retrieveEvent1Count.initializeValue();
- formQueueLocators.retrieveEvent2Count.initializeValue();
- formQueueLocators.retrieveRequestCount.initializeValue();
- formQueueLocators.retrieveDOMUpdateCount.initializeValue();
- }
-
- private void checkCounts(QueueLocators formQueueLocators, int events1, int events2, int requests, int domUpdates) {
- assertChangeIfNotEqualToOldValue(formQueueLocators.retrieveEvent1Count, events1, "event1Count");
- assertChangeIfNotEqualToOldValue(formQueueLocators.retrieveEvent2Count, events2, "event2Count");
- assertChangeIfNotEqualToOldValue(formQueueLocators.retrieveRequestCount, requests, "requestCount");
- assertChangeIfNotEqualToOldValue(formQueueLocators.retrieveDOMUpdateCount, domUpdates, "domUpdates");
- }
-
- private void assertChangeIfNotEqualToOldValue(Retriever<Integer> retrieveCount, Integer eventCount, String eventType) {
- if (!eventCount.equals(retrieveCount.getValue())) {
- assertEquals(waitAjax.failWith(eventType).waitForChangeAndReturn(retrieveCount), eventCount);
- } else {
- assertEquals(retrieveCount.retrieve(), eventCount);
- }
- }
-
- private void checkTimes(QueueLocators formQueueLocators, Event event, long requestDelay) {
- Retriever<Long> retrieveEventTime = (event == Event.FIRST) ? formQueueLocators.retrieveEvent1Time
- : formQueueLocators.retrieveEvent2Time;
- long eventTime = waitAjax.waitForChangeAndReturn(retrieveEventTime);
- long beginTime = waitAjax.waitForChangeAndReturn(formQueueLocators.retrieveBeginTime);
- long actualDelay = beginTime - eventTime;
- long deviation = Math.abs(actualDelay - requestDelay);
- long maxDeviation = Math.max(100, requestDelay);
-
- if (seleniumDebug) {
- System.out.println(format("deviation for requestDelay {0}: {1}", requestDelay, deviation));
- }
-
- assertTrue(
- deviation <= maxDeviation,
- format("Deviation ({0}) is greater than maxDeviation ({1}) for requestDelay {2}", deviation, maxDeviation,
- requestDelay));
-
- deviationTotal += deviation;
- deviationCount += 1;
- }
-
- private enum Event {
- FIRST, SECOND;
- }
}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2010-09-14 11:19:55 UTC (rev 19191)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2010-09-14 13:24:47 UTC (rev 19192)
@@ -21,17 +21,12 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jQueue;
-import static org.jboss.test.selenium.dom.Event.KEYPRESS;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
-import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
import java.net.URL;
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.cheiron.halt.XHRState;
-import org.jboss.test.selenium.waiting.retrievers.Retriever;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
@@ -44,17 +39,13 @@
*/
public class TestGlobalQueue extends AbstractMetamerTest {
- QueueLocators queue = new QueueLocators("globalQueue", pjq(""), pjq("#attributeForm"));
-
+ QueueModel queue = new QueueModel();
QueueAttributes attributes = new QueueAttributes();
@Inject
@Use(empty = false)
Integer requestDelay;
- int deviationTotal;
- int deviationCount;
-
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/a4jQueue/globalQueue.xhtml");
@@ -68,12 +59,14 @@
public void testRequestDelay() {
attributes.setRequestDelay(requestDelay);
- initializeTimes();
+ queue.initializeTimes();
+
for (int i = 0; i < 5; i++) {
- fireEvents(1);
- checkTimes();
+ queue.fireEvent(1);
+ queue.checkTimes(requestDelay);
}
- checkAvgDeviation();
+
+ queue.checkAvgDeviation(requestDelay);
}
/**
@@ -83,23 +76,23 @@
public void testMultipleRequestsWithDelay() {
attributes.setRequestDelay(3000);
- initializeCounts();
+ queue.initializeCounts();
XHRHalter.enable();
- fireEvents(4);
+ queue.fireEvent(4);
XHRHalter handle = XHRHalter.getHandleBlocking();
handle.send();
handle.complete();
- checkCounts(4, 1, 1);
+ queue.checkCounts(4, 1, 1);
- fireEvents(3);
+ queue.fireEvent(3);
handle.waitForOpen();
handle.send();
handle.complete();
- checkCounts(7, 2, 2);
+ queue.checkCounts(7, 2, 2);
XHRHalter.disable();
}
@@ -117,59 +110,59 @@
public void testMultipleRequestsWithNoDelay() {
attributes.setRequestDelay(0);
- initializeCounts();
+ queue.initializeCounts();
XHRHalter.enable();
- fireEvents(1);
- checkCounts(1, 1, 0);
+ queue.fireEvent(1);
+ queue.checkCounts(1, 1, 0);
XHRHalter handle = XHRHalter.getHandleBlocking();
handle.send();
- fireEvents(1);
- checkCounts(2, 1, 0);
+ queue.fireEvent(1);
+ queue.checkCounts(2, 1, 0);
handle.complete();
- checkCounts(2, 2, 1);
+ queue.checkCounts(2, 2, 1);
handle.waitForOpen();
handle.send();
- fireEvents(4);
- checkCounts(6, 2, 1);
+ queue.fireEvent(4);
+ queue.checkCounts(6, 2, 1);
handle.complete();
- checkCounts(6, 3, 2);
+ queue.checkCounts(6, 3, 2);
handle.waitForOpen();
handle.send();
- fireEvents(1);
- checkCounts(7, 3, 2);
+ queue.fireEvent(1);
+ queue.checkCounts(7, 3, 2);
handle.complete();
- checkCounts(7, 4, 3);
+ queue.checkCounts(7, 4, 3);
handle.waitForOpen();
handle.send();
- checkCounts(7, 4, 3);
+ queue.checkCounts(7, 4, 3);
handle.complete();
- checkCounts(7, 4, 4);
+ queue.checkCounts(7, 4, 4);
XHRHalter.disable();
}
-
+
@Test
@IssueTracking("https://jira.jboss.org/browse/RF-9328")
public void testRendered() {
attributes.setRequestDelay(1500);
attributes.setRendered(false);
-
- initializeTimes();
- fireEvents(1);
-
+
+ queue.initializeTimes();
+ queue.fireEvent(1);
+
// check that no requestDelay is applied while renderer=false
- checkTimes(0);
+ queue.checkTimes(0);
// TODO should check that no attributes is applied with renderes=false
}
@@ -180,10 +173,10 @@
XHRHalter.enable();
- fireEvents(1);
+ queue.fireEvent(1);
XHRHalter handle = XHRHalter.getHandleBlocking();
handle.continueBefore(XHRState.COMPLETE);
- fireEvents(10);
+ queue.fireEvent(10);
XHRHalter.disable();
@@ -196,82 +189,11 @@
attributes.setIgnoreDupResponses(true);
XHRHalter.enable();
- fireEvents(1);
+ queue.fireEvent(1);
XHRHalter handle = XHRHalter.getHandleBlocking();
handle.send();
- fireEvents(1);
+ queue.fireEvent(1);
handle.complete();
handle.waitForOpen();
}
-
- private void initializeTimes() {
- deviationTotal = 0;
- deviationCount = 0;
- queue.retrieveEvent1Time.initializeValue();
- queue.retrieveBeginTime.initializeValue();
- queue.retrieveCompleteTime.initializeValue();
- }
-
- private void fireEvents(int countOfEvents) {
- for (int i = 0; i < countOfEvents; i++) {
- selenium.fireEvent(queue.input1, KEYPRESS);
- }
- }
-
- private void initializeCounts() {
- queue.retrieveEvent1Count.initializeValue();
- queue.retrieveRequestCount.initializeValue();
- queue.retrieveDOMUpdateCount.initializeValue();
- }
-
- private void checkCounts(int events, int requests, int domUpdates) {
- assertChangeIfNotEqualToOldValue(queue.retrieveEvent1Count, events, "eventCount");
- assertChangeIfNotEqualToOldValue(queue.retrieveRequestCount, requests, "requestCount");
- assertChangeIfNotEqualToOldValue(queue.retrieveDOMUpdateCount, domUpdates, "domUpdates");
- }
-
- private void assertChangeIfNotEqualToOldValue(Retriever<Integer> retrieveCount, Integer eventCount, String eventType) {
- if (!eventCount.equals(retrieveCount.getValue())) {
- assertEquals(waitAjax.failWith(eventType).waitForChangeAndReturn(retrieveCount), eventCount);
- } else {
- assertEquals(retrieveCount.retrieve(), eventCount);
- }
- }
-
- private void checkTimes() {
- checkTimes(requestDelay);
- }
-
- private void checkTimes(long requestDelay) {
- long eventTime = waitAjax.waitForChangeAndReturn(queue.retrieveEvent1Time);
- long beginTime = waitAjax.waitForChangeAndReturn(queue.retrieveBeginTime);
- long actualDelay = beginTime - eventTime;
- long deviation = Math.abs(actualDelay - requestDelay);
- long maxDeviation = Math.max(50, requestDelay);
-
- if (seleniumDebug) {
- System.out.println(format("deviation for requestDelay {0}: {1}", requestDelay, deviation));
- }
-
- assertTrue(
- deviation <= maxDeviation,
- format("Deviation ({0}) is greater than maxDeviation ({1}) for requestDelay {2}", deviation, maxDeviation,
- requestDelay));
-
- deviationTotal += deviation;
- deviationCount += 1;
- }
-
- private void checkAvgDeviation() {
- long maximumAvgDeviation = Math.max(25, Math.min(50, requestDelay / 4));
- long averageDeviation = deviationTotal / deviationCount;
- if (seleniumDebug) {
- System.out.println("averageDeviation: " + averageDeviation);
- }
- assertTrue(
- averageDeviation <= maximumAvgDeviation,
- format(
- "Average deviation for all tests of requestDelay ({0}) should not be greater than defined maximum {1}",
- averageDeviation, maximumAvgDeviation));
- }
}
\ No newline at end of file
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19191 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-14 07:19:55 -0400 (Tue, 14 Sep 2010)
New Revision: 19191
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
Log:
a4j:queue - added test case for rendered=false (RFPL-733, RFPL-9328)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2010-09-14 10:58:27 UTC (rev 19190)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2010-09-14 11:19:55 UTC (rev 19191)
@@ -34,6 +34,7 @@
import org.jboss.test.selenium.waiting.retrievers.Retriever;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -157,6 +158,20 @@
XHRHalter.disable();
}
+
+ @Test
+ @IssueTracking("https://jira.jboss.org/browse/RF-9328")
+ public void testRendered() {
+ attributes.setRequestDelay(1500);
+ attributes.setRendered(false);
+
+ initializeTimes();
+ fireEvents(1);
+
+ // check that no requestDelay is applied while renderer=false
+ checkTimes(0);
+ // TODO should check that no attributes is applied with renderes=false
+ }
// TODO not implemented yet
public void testTimeout() {
@@ -222,8 +237,12 @@
assertEquals(retrieveCount.retrieve(), eventCount);
}
}
+
+ private void checkTimes() {
+ checkTimes(requestDelay);
+ }
- private void checkTimes() {
+ private void checkTimes(long requestDelay) {
long eventTime = waitAjax.waitForChangeAndReturn(queue.retrieveEvent1Time);
long beginTime = waitAjax.waitForChangeAndReturn(queue.retrieveBeginTime);
long actualDelay = beginTime - eventTime;
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19190 - trunk/examples/richfaces-showcase.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-09-14 06:58:27 -0400 (Tue, 14 Sep 2010)
New Revision: 19190
Modified:
trunk/examples/richfaces-showcase/readme.txt
Log:
Modified: trunk/examples/richfaces-showcase/readme.txt
===================================================================
--- trunk/examples/richfaces-showcase/readme.txt 2010-09-14 10:42:52 UTC (rev 19189)
+++ trunk/examples/richfaces-showcase/readme.txt 2010-09-14 10:58:27 UTC (rev 19190)
@@ -46,7 +46,8 @@
* mvn clean package -Pgae -Denforcer.skip=true
(enforcer skipped as resource plugin using snapshot plugin)
-And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation.
+And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation. Do not forget to register your
+own application name and rename the demo application accordingly.
more details about the resource plugin(it could be highly usefull not only in case of GAE usage but for general cases like serving resources at separate content systems) -
will be published at our wiki and announced at RichFaces usage space.
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19189 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-14 06:42:52 -0400 (Tue, 14 Sep 2010)
New Revision: 19189
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml
Log:
a4j:ajax - forgotten updated list.xhtml
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2010-09-14 10:05:04 UTC (rev 19188)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2010-09-14 10:42:52 UTC (rev 19189)
@@ -32,6 +32,10 @@
<metamer:testPageLink id="hCommandButton" outcome="hCommandButton" value="Command Button">
Simple page that contains <b>h:commandButton</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
</metamer:testPageLink>
+
+ <metamer:testPageLink id="hCommandButtonWrapped" outcome="hCommandButtonWrapped" value="Command Button Wrapped">
+ Simple page that contains <b>h:commandButton</b> nested in <b>a4j:ajax</b> and input boxes for all its attributes.
+ </metamer:testPageLink>
<metamer:testPageLink id="hCommandLink" outcome="hCommandLink" value="Command Link">
Simple page that contains <b>h:commandLink</b> with <b>a4j:ajax</b> and input boxes for all its attributes.
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19188 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-14 06:05:04 -0400 (Tue, 14 Sep 2010)
New Revision: 19188
Added:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
Log:
a4j:ajax - added sample for h:commandButton nested in a4j:ajax
Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hCommandButtonWrapped.xhtml 2010-09-14 10:05:04 UTC (rev 19188)
@@ -0,0 +1,74 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software 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 software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="head">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ <h:outputStylesheet library="css" name="a4jAjax.css"/>
+ </ui:define>
+
+ <ui:define name="outOfTemplateBefore">
+ </ui:define>
+
+ <ui:define name="component">
+ <h:inputText id="input" value="#{a4jAjaxBean.input}"/>
+ <a4j:ajax id="inputAjax" bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
+ data="#{a4jAjaxBean.attributes['data'].value}"
+ disabled="#{a4jAjaxBean.attributes['disabled'].value}"
+ event="click"
+ execute="#{a4jAjaxBean.attributes['execute'].value}"
+ immediate="#{a4jAjaxBean.attributes['immediate'].value}"
+ limitRender="#{a4jAjaxBean.attributes['limitRender'].value}"
+ onbeforedomupdate="#{a4jAjaxBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{a4jAjaxBean.attributes['onbegin'].value}"
+ oncomplete="#{a4jAjaxBean.attributes['oncomplete'].value}"
+ onerror="#{a4jAjaxBean.attributes['onerror'].value}"
+ onevent="#{a4jAjaxBean.attributes['onevent'].value}"
+ queueId="#{a4jAjaxBean.attributes['queueId'].value}"
+ render="#{a4jAjaxBean.attributes['render'].value}"
+ status="#{a4jAjaxBean.attributes['status'].value}"
+ >
+ <h:commandButton id="commandButton" value="Submit" />
+ </a4j:ajax>
+
+ <a4j:outputPanel id="output" layout="block">
+ <h:outputText value="#{a4jAjaxBean.input}"/>
+ </a4j:outputPanel>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{a4jAjaxBean.attributes}" id="attributes" render="log"/>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19187 - trunk/ui/output/ui/src/main/resources/META-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-09-14 04:25:48 -0400 (Tue, 14 Sep 2010)
New Revision: 19187
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
fix build
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-14 06:48:24 UTC (rev 19186)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-14 08:25:48 UTC (rev 19187)
@@ -11,16 +11,6 @@
</behavior>
<component>
- <component-type>org.richfaces.TabPanel</component-type>
- <component-class>org.richfaces.component.html.HtmlTabPanel</component-class>
- </component>
-
- <component>
- <component-type>org.richfaces.Tab</component-type>
- <component-class>org.richfaces.component.html.HtmlTab</component-class>
- </component>
-
- <component>
<component-type>org.richfaces.CollapsiblePanel</component-type>
<component-class>org.richfaces.component.html.HtmlCollapsiblePanel</component-class>
<property>
@@ -695,16 +685,6 @@
</renderer>
<renderer>
- <component-family>org.richfaces.TabPanel</component-family>
- <renderer-type>org.richfaces.TabPanel</renderer-type>
- <renderer-class>org.richfaces.renderkit.html.TabPanelRenderer</renderer-class>
- </renderer>
- <renderer>
- <component-family>org.richfaces.TogglePanelTitledItem</component-family>
- <renderer-type>org.richfaces.Tab</renderer-type>
- <renderer-class>org.richfaces.renderkit.html.TabRenderer</renderer-class>
- </renderer>
- <renderer>
<component-family>org.richfaces.Panel</component-family>
<renderer-type>org.richfaces.PanelRenderer</renderer-type>
<renderer-class>org.richfaces.renderkit.html.PanelRenderer</renderer-class>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-14 06:48:24 UTC (rev 19186)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-14 08:25:48 UTC (rev 19187)
@@ -29,192 +29,6 @@
</tag>
<tag>
- <tag-name>tabPanel</tag-name>
- <component>
- <component-type>org.richfaces.TabPanel</component-type>
- <renderer-type>org.richfaces.TabPanel</renderer-type>
-
- </component>
- <attribute>
- <description></description>
- <name>cycledSwitching</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>switchType</name>
- <type>org.richfaces.component.SwitchType</type>
- </attribute>
- <attribute>
- <description></description>
- <name>activeItem</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>bypassUpdates</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>limitToList</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>data</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description></description>
- <name>status</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>execute</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description></description>
- <name>render</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description></description>
- <name>immediate</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>itemChangeListener</name>
- <type>javax.el.MethodExpression</type>
- </attribute>
- <attribute>
- <description>Long long text</description>
- <name>id</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>binding description</description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>I don't know maybe some thing strange</description>
- <name>rendered</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerPosition</name>
- <type>org.richfaces.HeaderPosition</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerAlignment</name>
- <type>org.richfaces.HeaderAlignment</type>
- </attribute>
- <attribute>
- <description></description>
- <name>tabHeaderClassActive</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>tabHeaderClassDisabled</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>tabHeaderClassInactive</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>tabContentClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>tabHeaderClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onitemchange</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onbeforeitemchange</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>lang</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>title</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>style</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>styleClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>dir</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>ondblclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmousedown</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmousemove</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseout</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseover</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseup</name>
- <type>java.lang.String</type>
- </attribute>
-
- </tag>
-
-
- <tag>
<tag-name>collapsiblePanel</tag-name>
<component>
<component-type>org.richfaces.CollapsiblePanel</component-type>
@@ -1070,174 +884,4 @@
</attribute>
</tag>
- <tag>
- <tag-name>tab</tag-name>
- <component>
- <component-type>org.richfaces.TogglePanelTitledItem</component-type>
- <renderer-type>org.richfaces.Tab</renderer-type>
-
- </component>
- <attribute>
- <description></description>
- <name>disabled</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>header</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>name</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>switchType</name>
- <type>org.richfaces.component.SwitchType</type>
- </attribute>
- <attribute>
- <description>Long long text</description>
- <name>id</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>binding description</description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>I don't know maybe some thing strange</description>
- <name>rendered</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerClassActive</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerClassDisabled</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerClassInactive</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>headerStyle</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>contentClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onheaderclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onheaderdblclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onheadermousedown</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onheadermousemove</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onheadermouseup</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onenter</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onleave</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>lang</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>title</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>style</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>styleClass</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>dir</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>ondblclick</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmousedown</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmousemove</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseout</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseover</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description></description>
- <name>onmouseup</name>
- <type>java.lang.String</type>
- </attribute>
- </tag>
-
-
</facelet-taglib>
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19186 - in trunk/ui: output/ui and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-09-14 02:48:24 -0400 (Tue, 14 Sep 2010)
New Revision: 19186
Added:
trunk/ui/common/ui/richfaces-suppressions.xml
trunk/ui/output/ui/richfaces-suppressions.xml
Log:
Suppressions for checkstyle
Added: trunk/ui/common/ui/richfaces-suppressions.xml
===================================================================
--- trunk/ui/common/ui/richfaces-suppressions.xml (rev 0)
+++ trunk/ui/common/ui/richfaces-suppressions.xml 2010-09-14 06:48:24 UTC (rev 19186)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="MissingSwitchDefault" files="JSONTokener.java" />
+ <suppress checks="FallThrough" files="XMLTokener.java" />
+ <suppress checks="ModifiedControlVariable" files="Cookie.java" />
+</suppressions>
Added: trunk/ui/output/ui/richfaces-suppressions.xml
===================================================================
--- trunk/ui/output/ui/richfaces-suppressions.xml (rev 0)
+++ trunk/ui/output/ui/richfaces-suppressions.xml 2010-09-14 06:48:24 UTC (rev 19186)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" />
+</suppressions>
13 years, 8 months
- 1
- 0