JBoss Rich Faces SVN: r14295 - branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-05-25 04:53:34 -0400 (Mon, 25 May 2009)
New Revision: 14295
Modified:
branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
https://jira.jboss.org/jira/browse/RF-7241
Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-05-25 08:28:06 UTC (rev 14294)
+++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-05-25 08:53:34 UTC (rev 14295)
@@ -371,7 +371,7 @@
var value = jQuery(this.comboList.activeItem).text();
- if((this.comboValue.value && (this.comboValue.value != value)) {
+ if(this.comboValue.value && (this.comboValue.value != value)) {
Richfaces.invokeEvent(this.onchange, this.combobox, "onchange", {value:value});
}
14 years, 11 months
JBoss Rich Faces SVN: r14294 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main: java/org/richfaces/regressionarea/issues/rf7064 and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-25 04:28:06 -0400 (Mon, 25 May 2009)
New Revision: 14294
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/advanced.properties
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/simple.properties
Log:
RF-7064 java bean and resources added.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/EditorBean.java 2009-05-25 08:28:06 UTC (rev 14294)
@@ -0,0 +1,87 @@
+package org.richfaces.regressionarea.issues.rf7064;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.faces.validator.ValidatorException;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.ui.validator.FormattedTextValidator;
+
+@Name("editorBean")
+(a)Scope(ScopeType.SESSION)
+public class EditorBean {
+
+ private String currentConfiguration = "simple";
+ private String viewMode = "visual";
+ private String value;
+ private boolean liveUpdatesEnabled=false;
+ private boolean useSeamText=false;
+
+// private static final String CONFIGS_PACKAGE = "/org/richfaces/demo/editor/";
+ List<SelectItem> configurations = new ArrayList<SelectItem>();
+
+ public EditorBean() {
+ configurations.add(new SelectItem("simple", "Simple"));
+ configurations.add(new SelectItem("advanced", "Advanced"));
+ }
+
+ public void resetValue() {
+ value = "";
+ }
+
+ public String getCurrentConfiguration() {
+ return currentConfiguration;
+ }
+
+ public void setCurrentConfiguration(String currentConfiguration) {
+ this.currentConfiguration = currentConfiguration;
+ }
+
+ public List<SelectItem> getConfigurations() {
+ return configurations;
+ }
+
+ public String getViewMode() {
+ return viewMode;
+ }
+
+ public void setViewMode(String viewMode) {
+ this.viewMode = viewMode;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public boolean isLiveUpdatesEnabled() {
+ return liveUpdatesEnabled;
+ }
+
+ public void setLiveUpdatesEnabled(boolean liveUpdatesEnabled) {
+ this.liveUpdatesEnabled = liveUpdatesEnabled;
+ }
+
+ public boolean isUseSeamText() {
+ return useSeamText;
+ }
+
+ public void setUseSeamText(boolean useSeamText) {
+ this.useSeamText = useSeamText;
+ }
+
+ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+ if (useSeamText) {
+ new FormattedTextValidator().validate(context, component, value);
+ }
+ }
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf7064/InputResetBean.java 2009-05-25 08:28:06 UTC (rev 14294)
@@ -0,0 +1,54 @@
+/**
+ * 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.regressionarea.issues.rf7064;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ValueChangeEvent;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+@Name("inputResetBean")
+(a)Scope(ScopeType.EVENT)
+public class InputResetBean {
+
+ @In
+ private FacesContext facesContext;
+
+ public void processValueChange(ValueChangeEvent valueChangeEvent) {
+ if (facesContext.getMaximumSeverity() != null) {
+ UIComponent component = valueChangeEvent.getComponent();
+ if (component instanceof UIInput) {
+ UIInput input = (UIInput) component;
+ input.resetValue();
+ }
+ }
+ }
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/advanced.properties
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/advanced.properties (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/advanced.properties 2009-05-25 08:28:06 UTC (rev 14294)
@@ -0,0 +1,5 @@
+theme="advanced"
+theme_advanced_toolbar_location="top"
+theme_advanced_toolbar_align="left"
+plugins="preview,insertdatetime"
+theme_advanced_buttons3="hr,removeformat,visualaid,separator,sub,sup,separator,charmap"
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/simple.properties
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/simple.properties (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/resources/simple.properties 2009-05-25 08:28:06 UTC (rev 14294)
@@ -0,0 +1 @@
+theme="simple"
14 years, 11 months
JBoss Rich Faces SVN: r14293 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-25 04:26:44 -0400 (Mon, 25 May 2009)
New Revision: 14293
Modified:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml
Log:
Add seam-ui dependency
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-05-25 08:26:25 UTC (rev 14292)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2009-05-25 08:26:44 UTC (rev 14293)
@@ -27,8 +27,23 @@
<artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
</dependency>
-
<dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seamversion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ <version>${seamversion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
14 years, 11 months
JBoss Rich Faces SVN: r14292 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-25 04:26:25 -0400 (Mon, 25 May 2009)
New Revision: 14292
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf7064.xhtml
Log:
RF-7064 page added.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf7064.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf7064.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf7064.xhtml 2009-05-25 08:26:25 UTC (rev 14292)
@@ -0,0 +1,89 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <h:form id="form">
+ <h:panelGrid columns="2" width="100%" columnClasses="column,column">
+ <h:panelGroup style="height:320px;width:400px;" layout="block">
+ <rich:editor configuration="#{editorBean.currentConfiguration}"
+ id="editor" width="400" height="300"
+ validator="#{editorBean.validate}"
+ viewMode="#{editorBean.viewMode}" value="#{editorBean.value}"
+ useSeamText="#{editorBean.useSeamText}">
+ <a4j:support event="onchange" reRender="result" ajaxSingle="true"
+ requestDelay="1000"
+ onsubmit="if (!#{rich:element('form:editorvalue')} && !#{editorBean.useSeamText}) return false;" />
+ </rich:editor>
+ </h:panelGroup>
+ <rich:panel id="controls">
+ <f:facet name="header">
+ <h:outputText value="Editor Settings" />
+ </f:facet>
+ <h:panelGrid columns="2">
+ <h:outputText value="Select Editor Theme" />
+ <h:selectOneRadio value="#{editorBean.currentConfiguration}"
+ layout="pageDirection"
+ valueChangeListener="#{inputResetBean.processValueChange}">
+ <f:selectItems value="#{editorBean.configurations}" />
+ <a4j:support event="onclick" reRender="editor,controls"
+ requestDelay="500" eventsQueue="settingsQueue"
+ similarityGroupingId="settings" />
+ </h:selectOneRadio>
+ <h:outputText value="Toggle Modes" escape="false" />
+ <h:selectOneRadio value="#{editorBean.viewMode}"
+ layout="pageDirection"
+ valueChangeListener="#{inputResetBean.processValueChange}" id="toogleModes">
+ <f:selectItem itemLabel="WYSIWYG mode" itemValue="visual" id="wysiwyg"/>
+ <f:selectItem itemLabel="Text Area(Disables Preview)"
+ itemValue="source" id="textArea" />
+ <a4j:support event="onclick" reRender="editor,controls"
+ requestDelay="500" eventsQueue="settingsQueue"
+ similarityGroupingId="settings" />
+ </h:selectOneRadio>
+ <h:outputText value="Toggle Preview: " />
+ <h:selectBooleanCheckbox value="#{editorBean.liveUpdatesEnabled}"
+ valueChangeListener="#{inputResetBean.processValueChange}">
+ <a4j:support event="onclick" reRender="result,controls"
+ requestDelay="500" eventsQueue="settingsQueue"
+ similarityGroupingId="settings" />
+ </h:selectBooleanCheckbox>
+ <h:outputText value="Use Seam Text: " />
+ <h:selectBooleanCheckbox value="#{editorBean.useSeamText}" id="useSeamText">
+ <a4j:support event="onclick" reRender="editor,result,controls"
+ requestDelay="500" ajaxSingle="true" eventsQueue="settingsQueue"
+ similarityGroupingId="settings"
+ action="#{editorBean.resetValue}" />
+ </h:selectBooleanCheckbox>
+ </h:panelGrid>
+ </rich:panel>
+
+ <a4j:outputPanel layout="block" id="result">
+
+ <a4j:outputPanel style="color: red;"
+ rendered="#{facesContext.maximumSeverity != null and editorBean.useSeamText}">
+ <h:outputText value="SeamText: " />
+ </a4j:outputPanel>
+ <rich:message for="editor" style="color: red;" />
+
+ <rich:panel rendered="#{editorBean.liveUpdatesEnabled}"
+ style="#{facesContext.maximumSeverity != null ? 'display: none;' : ''}">
+ <f:facet name="header">
+ <h:outputText value="Preview" />
+ </f:facet>
+ <h:inputTextarea readonly="true" id="editorvalue"
+ value="#{editorBean.value}" cols="55" rows="20" />
+ </rich:panel>
+ </a4j:outputPanel>
+ <h:outputText />
+ </h:panelGrid>
+ </h:form>
+
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
14 years, 11 months
JBoss Rich Faces SVN: r14291 - branches/community/3.3.X/test-applications/regressionArea/regressionArea-web.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-25 04:24:47 -0400 (Mon, 25 May 2009)
New Revision: 14291
Modified:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml
Log:
Add seam-ui dependency for RF-7064 testing.
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2009-05-25 08:23:23 UTC (rev 14290)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/pom.xml 2009-05-25 08:24:47 UTC (rev 14291)
@@ -59,6 +59,12 @@
<version>${jsfversion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsfversion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
@@ -111,7 +117,7 @@
</dependency>
</dependencies>
<build>
- <finalName>regressionArea-web</finalName>
+ <finalName>regressionArea</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
14 years, 11 months
JBoss Rich Faces SVN: r14290 - in branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng: rf7064 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-25 04:23:23 -0400 (Mon, 25 May 2009)
New Revision: 14290
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7064/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7064/Test.java
Log:
RF-7064 test java bean
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7064/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7064/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf7064/Test.java 2009-05-25 08:23:23 UTC (rev 14290)
@@ -0,0 +1,27 @@
+package org.richfaces.testng.rf7064;
+
+import org.richfaces.SeleniumTestBase;
+
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ selenium.assignId("form:toogleModes:1", "textArea");
+ clickAjaxCommandAndWait("textArea");
+
+ clickAjaxCommandAndWait("form:useSeamText");
+ type("form:editorTextArea", "<h1>header</h1>");
+
+ clickAjaxCommandAndWait("form:toogleModes:0");
+
+ AssertTextEquals("//*[@id='tinymce']/h1", "header");
+
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf7064.xhtml";
+ }
+}
\ No newline at end of file
14 years, 11 months
JBoss Rich Faces SVN: r14289 - in branches/jsf2.0/cdk/generator: src/main/xsd and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-05-22 20:04:14 -0400 (Fri, 22 May 2009)
New Revision: 14289
Modified:
branches/jsf2.0/cdk/generator/pom.xml
branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd
Log:
Modified: branches/jsf2.0/cdk/generator/pom.xml
===================================================================
--- branches/jsf2.0/cdk/generator/pom.xml 2009-05-22 22:50:40 UTC (rev 14288)
+++ branches/jsf2.0/cdk/generator/pom.xml 2009-05-23 00:04:14 UTC (rev 14289)
@@ -22,6 +22,20 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <packageName>org.richfaces.cdk.model</packageName> <!-- The name of your generated source package -->
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd
===================================================================
--- branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-22 22:50:40 UTC (rev 14288)
+++ branches/jsf2.0/cdk/generator/src/main/xsd/cdk.xsd 2009-05-23 00:04:14 UTC (rev 14289)
@@ -42,7 +42,11 @@
</xsd:complexType>
<xsd:simpleType name="javaType">
- <xsd:restriction base="xsd:token"></xsd:restriction>
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern
+ value="[a-zA-Z_$][a-zA-Z0-9_$]*([.][a-zA-Z_$][a-zA-Z0-9_$]*)*">
+ </xsd:pattern>
+ </xsd:restriction>
</xsd:simpleType>
<xsd:complexType name="classnameType">
14 years, 11 months
JBoss Rich Faces SVN: r14288 - branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-22 18:50:40 -0400 (Fri, 22 May 2009)
New Revision: 14288
Modified:
branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java
Log:
https://jira.jboss.org/jira/browse/RF-5773
Modified: branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java
===================================================================
--- branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java 2009-05-22 22:37:17 UTC (rev 14287)
+++ branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java 2009-05-22 22:50:40 UTC (rev 14288)
@@ -42,7 +42,7 @@
* @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:22 $
*
*/
-public abstract class UIAjaxForm extends UIForm implements AjaxComponent, AjaxSource
+public abstract class UIAjaxForm extends UIForm implements AjaxComponent, AjaxSource, IterationStateHolder
{
public static final String COMPONENT_TYPE = "org.ajax4jsf.Form";
@@ -171,4 +171,11 @@
public abstract void setAjaxSubmit(boolean ajax);
+ public Object getIterationState() {
+ return isSubmitted() ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public void setIterationState(Object state) {
+ setSubmitted(Boolean.TRUE.equals(state));
+ }
}
14 years, 11 months
JBoss Rich Faces SVN: r14287 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773 and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-22 18:37:17 -0400 (Fri, 22 May 2009)
New Revision: 14287
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5773/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5773/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5773.xhtml
Modified:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
Log:
https://jira.jboss.org/jira/browse/RF-5773
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Bean.java 2009-05-22 22:37:17 UTC (rev 14287)
@@ -0,0 +1,57 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+package org.richfaces.regressionarea.issues.rf5773;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * This test case for: <a href="https://jira.jboss.org/jira/browse/RF-5773">RF-5773 -
+ * Forms not working within DataTable</a>
+ *
+ * @author Nick Belaevski
+ * @since 3.3.2
+ */
+
+@Name("rf5773")
+(a)Scope(ScopeType.SESSION)
+public class Bean {
+
+ private List<Item> items;
+
+ public Bean() {
+ items = new ArrayList<Item>();
+ for (int i = 0; i < 3; i++) {
+ items.add(new Item("Item " + i));
+ }
+ }
+
+ public List<Item> getItems() {
+ return items;
+ }
+
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf5773/Item.java 2009-05-22 22:37:17 UTC (rev 14287)
@@ -0,0 +1,63 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.regressionarea.issues.rf5773;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.2
+ */
+public class Item {
+
+ private String value;
+
+ private int counter = 0;
+
+ public Item(String value) {
+ super();
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public void incCounter() {
+ counter++;
+ }
+
+ public void validate(FacesContext context, UIComponent component, Object value) {
+ String messageText = value.toString();
+ context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, messageText, messageText));
+ }
+
+ public int getCounter() {
+ return counter;
+ }
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5773/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5773/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf5773/Test.java 2009-05-22 22:37:17 UTC (rev 14287)
@@ -0,0 +1,81 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+package org.richfaces.testng.rf5773;
+
+import junit.framework.Assert;
+
+import org.richfaces.SeleniumTestBase;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.2
+ */
+public class Test extends SeleniumTestBase {
+
+ private void checkStep(String[] text, int[] counter) {
+ for (int i = 0; i < text.length; i++) {
+ String s = getTextById("outputRepeat:" + i + ":valuePanel");
+
+ Assert.assertEquals(
+ String.format("Value check failed for step: [%d]; expected '%s' was '%s'", i, text[i], s),
+ text[i], s);
+ }
+
+ for (int i = 0; i < counter.length; i++) {
+ String s = getTextById("outputRepeat:" + i + ":counterPanel");
+ Assert.assertEquals(
+ String.format("Counter check failed for step: [%d]; expected '%s' was '%s'", i, counter[i], s),
+ String.valueOf(counter[i]), s);
+ }
+ }
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ String[] text = {"Item 0", "Item 1", "Item 2"};
+ int[] counter = new int[text.length];
+
+ //check initial setup
+ checkStep(text, counter);
+ AssertTextEquals("messages", "");
+ //initial setup ok
+
+ for (int i = 0; i < text.length; i++) {
+ text[i] = "Val:" + String.valueOf(i) ;
+ counter[i]++;
+ type("formsRepeat:" + i + ":form:input", text[i]);
+ clickAjaxCommandAndWait("formsRepeat:" + i + ":form:link");
+
+ checkStep(text, counter);
+ AssertTextEquals("messages", text[i]);
+ }
+
+ }
+
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf5773.xhtml";
+ }
+}
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-05-22 16:36:40 UTC (rev 14286)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-05-22 22:37:17 UTC (rev 14287)
@@ -31,6 +31,7 @@
<package name="org.richfaces.testng.rf6035" />
<package name="org.richfaces.testng.rf6267" />
<package name="org.richfaces.testng.rf6547" />
+ <package name="org.richfaces.testng.rf5773" />
</packages>
</test>
</suite>
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5773.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5773.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf5773.xhtml 2009-05-22 22:37:17 UTC (rev 14287)
@@ -0,0 +1,36 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+
+ <ui:define name="template">
+ <a4j:repeat value="#{rf5773.items}" var="item" id="formsRepeat">
+ <a4j:form id="form">
+ <h:inputText value="#{item.value}" id="input" validator="#{item.validate}" />
+ <a4j:commandLink action="#{item.incCounter}" value="link" id="link"/>
+ </a4j:form>
+ </a4j:repeat>
+
+ <rich:messages id="messages" />
+
+ <a4j:outputPanel ajaxRendered="true">
+ <a4j:repeat value="#{rf5773.items}" var="item" id="outputRepeat">
+ <a4j:outputPanel id="valuePanel">
+ #{item.value}
+ </a4j:outputPanel>
+ <h:outputText value=" - " />
+ <a4j:outputPanel id="counterPanel">
+ #{item.counter}
+ </a4j:outputPanel>
+ <br />
+ </a4j:repeat>
+ </a4j:outputPanel>
+
+ </ui:define>
+</ui:composition>
+</html>
14 years, 11 months
JBoss Rich Faces SVN: r14286 - in branches/community/3.3.X/ui/dataTable/src: main/java/org/richfaces/renderkit/html and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-05-22 12:36:40 -0400 (Fri, 22 May 2009)
New Revision: 14286
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx
branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java
branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java
Log:
RF-7216 RF-7217
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -46,14 +46,14 @@
if(null != dt){
writer.startElement("dt", dt);
String rowClass = holder.getColumnClass(currentRow);
- encodeStyleClass(writer, null, "dr-definition-term rich-definition-term", null, rowClass);
+ encodeStyleClass(writer, null, "rich-definition-term", null, rowClass);
renderChild(context, dt);
writer.endElement("dt");
}
writer.startElement("dd", table);
getUtils().encodeId(context, table);
String rowClass = holder.getRowClass();
- encodeStyleClass(writer, null, "dr-definition rich-definition", null, rowClass);
+ encodeStyleClass(writer, null, "rich-definition", null, rowClass);
encodeRowEvents(context, table);
renderChildren(context, table);
writer.endElement("dd");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -44,7 +44,7 @@
if(header != null ){
writer.startElement("thead", table);
String headerClass = (String) table.getAttributes().get("headerClass");
- encodeTableHeaderFacet(context, table.getColumns(), writer, header, "dr-table-header rich-table-header","dr-table-header-continue rich-table-header-continue", "dr-table-headercell rich-table-headercell", headerClass, "th");
+ encodeTableHeaderFacet(context, table.getColumns(), writer, header, "rich-table-header","rich-table-header-continue", "rich-table-headercell", headerClass, "th");
writer.endElement("thead");
}
}
@@ -55,7 +55,7 @@
if(footer != null ){
writer.startElement("tfoot", table);
String footerClass = (String) table.getAttributes().get("footerClass");
- encodeTableHeaderFacet(context, table.getColumns(), writer, footer, "dr-table-footer rich-table-footer","dr-table-footer-continue rich-table-footer-continue", "dr-table-footercell rich-table-footercell", footerClass, "td");
+ encodeTableHeaderFacet(context, table.getColumns(), writer, footer, "rich-table-footer","rich-table-footer-continue", "rich-table-footercell", footerClass, "td");
writer.endElement("tfoot");
}
@@ -85,14 +85,14 @@
writer.startElement(HTML.TR_ELEMENT, table);
String rowClass = holder.getRowClass(gridRowCounter);
- encodeStyleClass(writer, null, "dr-table-row rich-table-row", null, rowClass);
+ encodeStyleClass(writer, null, "rich-table-row", null, rowClass);
encodeRowEvents(context, table);
}
writer.startElement(HTML.td_ELEM, table);
getUtils().encodeId(context, table);
String columnClass = holder.getColumnClass(currentRow-gridRowCounter*cols);
- encodeStyleClass(writer, null, "dr-table-cell rich-table-cell", null, columnClass);
+ encodeStyleClass(writer, null, "rich-table-cell", null, columnClass);
renderChildren(context, table);
writer.endElement(HTML.td_ELEM);
}
@@ -114,7 +114,7 @@
for(int i = rest;i<columns.intValue();i++){
writer.startElement(HTML.td_ELEM, table);
String columnClass = tableHolder.getColumnClass(i);
- encodeStyleClass(writer, null, "dr-table-cell rich-table-cell", null, columnClass);
+ encodeStyleClass(writer, null, "rich-table-cell", null, columnClass);
writer.writeText("\u00A0", null);//
writer.endElement(HTML.td_ELEM);
}
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -44,7 +44,7 @@
writer.startElement("li", table);
getUtils().encodeId(context, table);
String rowClass = holder.getRowClass();
- encodeStyleClass(writer, null, "dr-list-item rich-list-item", null, rowClass);
+ encodeStyleClass(writer, null, "rich-list-item", null, rowClass);
encodeRowEvents(context, table);
renderChildren(context, table);
writer.endElement("li");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -149,9 +149,9 @@
String captionClass = (String) table.getAttributes().get("captionClass");
if (captionClass != null) {
- captionClass = "dr-table-caption rich-table-caption " + captionClass;
+ captionClass = "rich-table-caption " + captionClass;
} else {
- captionClass = "dr-table-caption rich-table-caption";
+ captionClass = "rich-table-caption";
}
writer.writeAttribute("class", captionClass, "captionClass");
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -173,24 +173,24 @@
ResponseWriter writer = context.getResponseWriter();
writer.startElement("thead", table);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-thead", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-table-thead", null);
String headerClass = (String) table.getAttributes().get("headerClass");
if (header != null) {
encodeTableHeaderFacet(context, numberOfColumns, writer, header,
- "dr-table-header rich-table-header",
- "dr-table-header-continue rich-table-header-continue",
- "dr-table-headercell rich-table-headercell",
+ "rich-table-header",
+ "rich-table-header-continue",
+ "rich-table-headercell",
headerClass, "th");
}
if (columnFacetPresent || isFilterByPresent) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
- "dr-table-subheader rich-table-subheader", null,
+ "rich-table-subheader", null,
headerClass);
encodeHeaderFacets(context, writer, table.columns(),
- "dr-table-subheadercell rich-table-subheadercell",
+ "rich-table-subheadercell",
headerClass, "header", "th", numberOfColumns);
writer.endElement("tr");
@@ -318,20 +318,20 @@
if (columnFacetPresent) {
writer.startElement("tr", table);
encodeStyleClass(writer, null,
- "dr-table-subfooter rich-table-subfooter", null,
+ "rich-table-subfooter", null,
footerClass);
encodeHeaderFacets(context, writer, tableColumns,
- "dr-table-subfootercell rich-table-subfootercell",
+ "rich-table-subfootercell",
footerClass, "footer", "td",columns);
writer.endElement("tr");
}
if (footer != null) {
encodeTableHeaderFacet(context, columns, writer, footer,
- "dr-table-footer rich-table-footer",
- "dr-table-footer-continue rich-table-footer-continue",
- "dr-table-footercell rich-table-footercell",
+ "rich-table-footer",
+ "rich-table-footer-continue",
+ "rich-table-footercell",
footerClass, "td");
}
writer.endElement("tfoot");
@@ -425,21 +425,21 @@
* @return
*/
protected String getRowSkinClass() {
- return "dr-table-row rich-table-row";
+ return "rich-table-row";
}
/**
* @return
*/
protected String getFirstRowSkinClass() {
- return "dr-table-firstrow rich-table-firstrow";
+ return "rich-table-firstrow";
}
/**
* @return
*/
protected String getCellSkinClass() {
- return "dr-table-cell rich-table-cell";
+ return "rich-table-cell";
}
protected void encodeRowStart(FacesContext context, String skinClass,
@@ -746,7 +746,7 @@
if (sortableColumn) {
writer.startElement(HTML.SPAN_ELEM, column);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-sortable-header", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-table-sortable-header", null);
}
}
@@ -782,7 +782,7 @@
writer.writeAttribute(HTML.alt_ATTRIBUTE, "", null);
writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null);
writer.writeAttribute(HTML.height_ATTRIBUTE, "15", null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-header-sort-img rich-sort-icon", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-sort-icon", null);
writer.endElement(HTML.IMG_ELEMENT);
}
writer.endElement(HTML.SPAN_ELEM);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/CellRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -46,7 +46,7 @@
if (null != parentPredefined) {
styleClass.append(parentPredefined).append(" ");
} else {
- styleClass.append("dr-table-cell rich-table-cell ");
+ styleClass.append("rich-table-cell ");
}
// Append class from parent component.
Object parent = requestMap.get(AbstractRowsRenderer.CELL_CLASS_KEY);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -114,7 +114,7 @@
}
encodeStyleClass(context.getResponseWriter(), requestMap
.get(AbstractRowsRenderer.SKIN_CELL_CLASS_KEY),
- "dr-table-cell rich-table-cell", requestMap
+ "rich-table-cell", requestMap
.get(AbstractRowsRenderer.CELL_CLASS_KEY),
styleClass);
// TODO - encode column attributes.
@@ -156,7 +156,7 @@
.get(AbstractRowsRenderer.SKIN_FIRST_ROW_CLASS_KEY)
: requestMap.get(AbstractRowsRenderer.SKIN_ROW_CLASS_KEY);
encodeStyleClass(context.getResponseWriter(), skinRowClass,
- "dr-tablerow rich-tablerow", requestMap
+ "rich-tablerow", requestMap
.get(AbstractRowsRenderer.ROW_CLASS_KEY), styleClass);
encodeStyle(context.getResponseWriter(),null, null, null, style);
getUtils().encodePassThruWithExclusionsArray(context, colspan,EVENT_ATTRS);
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -66,8 +66,8 @@
facetName+"Class");
if (isColumnFacetPresent(dataTable, facetName)) {
writer.startElement(HTML.TR_ELEMENT, dataTable);
- encodeStyleClass(writer, null, "dr-subtable-"+facetName+" rich-subtable-"+facetName, null, headerClass);
- encodeHeaderFacets(context, writer, columns, "dr-subtable-"+facetName+"cell rich-subtable-"+facetName+"cell", headerClass,
+ encodeStyleClass(writer, null, "rich-subtable-"+facetName, null, headerClass);
+ encodeHeaderFacets(context, writer, columns, "rich-subtable-"+facetName+"cell", headerClass,
facetName, "td",colCount);
writer.endElement(HTML.TR_ELEMENT);
}
@@ -88,20 +88,20 @@
* @return
*/
protected String getRowSkinClass() {
- return "dr-subtable-row rich-subtable-row";
+ return "rich-subtable-row";
}
/**
* @return
*/
protected String getFirstRowSkinClass() {
- return "dr-subtable-firstrow rich-subtable-firstrow";
+ return "rich-subtable-firstrow";
}
/* (non-Javadoc)
* @see org.richfaces.renderkit.AbstractTableRenderer#getCellSkinClass()
*/
protected String getCellSkinClass() {
- return "dr-subtable-cell rich-subtable-cell";
+ return "rich-subtable-cell";
}
/*
* (non-Javadoc)
Modified: branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2009-05-22 16:36:40 UTC (rev 14286)
@@ -2,7 +2,7 @@
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
-<u:selector name=".dr-table" >
+<u:selector name=".rich-table" >
<u:style name="border-top" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -17,7 +17,7 @@
<u:style name="border-collapse" value="collapse" />
</u:selector>
-<u:selector name=".dr-table-cell" >
+<u:selector name=".rich-table-cell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -32,7 +32,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-subtable-cell" >
+<u:selector name=".rich-subtable-cell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -47,7 +47,7 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-header" >
+<u:selector name=".rich-table-header" >
<u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
<u:style name="background-image" > <!--from headerGradientColor to headerBackgroundColor-->
<f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
@@ -56,11 +56,11 @@
<u:style name="background-repeat" value="repeat-x"/>
</u:selector>
-<u:selector name=".dr-table-header-continue" >
+<u:selector name=".rich-table-header-continue" >
<u:style name="background-color" skin="headerBackgroundColor"/> <!--headerBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-headercell" >
+<u:selector name=".rich-table-headercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -77,18 +77,18 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subheader" >
+<u:selector name=".rich-table-subheader" >
<u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-thead" >
+<u:selector name=".rich-table-thead" >
<u:style name="border-bottom" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
</u:style>
</u:selector>
-<u:selector name=".dr-table-subheadercell" >
+<u:selector name=".rich-table-subheadercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -102,13 +102,13 @@
</u:selector>
<f:verbatim>
- .dr-table-sortable-header {
+ .rich-table-sortable-header {
background-position: right center;
background-repeat: no-repeat;
white-space : nowrap;
}
- .dr-table-cursor-pointer {
+ .rich-table-cursor-pointer {
cursor: pointer;
}
@@ -116,21 +116,21 @@
cursor: default;
}
- .dr-table-header-sort-img {
+ .rich-sort-icon {
vertical-align: middle;
}
</f:verbatim>
-<u:selector name=".dr-table-footer" >
+<u:selector name=".rich-table-footer" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footer-continue" >
+<u:selector name=".rich-table-footer-continue" >
<u:style name="background-color" skin="tableFooterBackgroundColor"/> <!--tableFooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-footercell" >
+<u:selector name=".rich-table-footercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -147,11 +147,11 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-subfooter" >
+<u:selector name=".rich-table-subfooter" >
<u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-table-subfootercell" >
+<u:selector name=".rich-table-subfootercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -167,21 +167,21 @@
<u:style name="font-family" skin="generalFamilyFont"/> <!--generalFamilyFont-->
</u:selector>
-<u:selector name=".dr-table-firstrow .dr-table-cell" >
+<u:selector name=".rich-table-firstrow .rich-table-cell" >
<!-- <u:style name="border-top" value="2px solid">
<f:verbatim skin="tableBorderColor" />
</u:style> -->
</u:selector>
-<u:selector name=".dr-subtable-firstrow .dr-subtable-cell" >
+<u:selector name=".rich-subtable-firstrow .rich-subtable-cell" >
<!-- <u:style name="border" value="2px solid #c0c0c0"/>-->
</u:selector>
-<u:selector name=".dr-subtable-header" >
+<u:selector name=".rich-subtable-header" >
<u:style name="background-color" skin="additionalBackgroundColor"/> <!--additionalBackgroundColor-->
</u:selector>
-<u:selector name=".dr-subtable-headercell" >
+<u:selector name=".rich-subtable-headercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
@@ -198,11 +198,11 @@
</u:selector>
-<u:selector name=".dr-subtable-footer" >
+<u:selector name=".rich-subtable-footer" >
<u:style name="background-color" skin="tableSubfooterBackgroundColor"/> <!--tableSubfooterBackgroundColor-->
</u:selector>
-<u:selector name=".dr-subtable-footercell" >
+<u:selector name=".rich-subtable-footercell" >
<u:style name="border-right" value="solid"> <!--tableBorderColor-->
<f:verbatim skin="tableBorderWidth" />
<f:verbatim skin="tableBorderColor" />
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/datatable/css/table.xcss 2009-05-22 16:36:40 UTC (rev 14286)
@@ -3,13 +3,13 @@
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.dr-table{
+.rich-table{
border-top : 1px solid #c0c0c0; /*panelBorderColor*/
border-left : 1px solid #c0c0c0; /*panelBorderColor*/
background-color : #ffffff; /*tableBackgroundColor*/
}
-.dr-table-cell{
+.rich-table-cell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -18,7 +18,7 @@
font-family : verdana; /*generalFamilyFont*/
}
-.dr-subtable-cell{
+.rich-subtable-cell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -27,14 +27,14 @@
font-family : verdana; /*generalFamilyFont*/
}
-.dr-table-header{
+.rich-table-header{
background-color : #4A75B5; /*headerBackgroundColor*/
background-image : url(dttbl_header_bg.gif); /*from headerGradientColor to headerBackgroundColor*/
background-position : top left;
background-repeat : repeat-x;
}
-.dr-table-headercell{
+.rich-table-headercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -43,22 +43,22 @@
font-weight : bold;
}
-.dr-table-subheader{
+.rich-table-subheader{
background-color : #EAF0F8; /*additionalBackgroundColor*/
}
-.dr-table-subheadercell{
+.rich-table-subheadercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
text-align : center;
}
-.dr-table-footer{
+.rich-table-footer{
background-color : #cccccc; /*tableFooterBackgroundColor*/
}
-.dr-table-footercell{
+.rich-table-footercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -66,27 +66,27 @@
text-align : center;
font-weight : bold;
}
-.dr-table-subfooter{
+.rich-table-subfooter{
background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
}
-.dr-table-subfootercell{
+.rich-table-subfootercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
text-align : center;
}
-.dr-table-firstrow .dr-table-cell{
+.rich-table-firstrow .rich-table-cell{
border-top : 2px solid #c0c0c0;
}
-.dr-subtable-firstrow .dr-subtable-cell{
+.rich-subtable-firstrow .rich-subtable-cell{
/* border-top : 2px solid #c0c0c0;*/
}
-.dr-subtable-header{
+.rich-subtable-header{
background-color : #EAF0F8; /*additionalBackgroundColor*/
}
-.dr-subtable-headercell{
+.rich-subtable-headercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
@@ -94,11 +94,11 @@
}
-.dr-subtable-footer{
+.rich-subtable-footer{
background-color : #f1f1f1; /*tableSubfooterBackgroundColor*/
}
-.dr-subtable-footercell{
+.rich-subtable-footercell{
border-right : 1px solid #c0c0c0; /*panelBorderColor*/
border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
padding : 4px 4px 4px 4px;
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataDefinitionList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<dl id="#{clientId}"
- class="dr-deflist rich-deflist #{component.attributes['styleClass']}"
+ class="rich-deflist #{component.attributes['styleClass']}"
x:passThruWithExclusions="value,id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataGrid.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -14,7 +14,7 @@
<h:styles>css/table.xcss</h:styles>
<f:clientid var="clientId"/>
<table id="#{clientId}"
- class="dr-table rich-table #{component.attributes['styleClass']}"
+ class="rich-table #{component.attributes['styleClass']}"
x:passThruWithExclusions="value,name,type,class,id"
>
<f:call name="encodeCaption" />
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<ul id="#{clientId}"
- class="dr-list rich-datalist #{component.attributes['styleClass']}"
+ class="rich-datalist #{component.attributes['styleClass']}"
x:passThruWithExclusions="id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataOrderedList.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -12,7 +12,7 @@
>
<f:clientid var="clientId"/>
<ol id="#{clientId}"
- class="dr-list rich-orderedlist #{component.attributes['styleClass']}"
+ class="rich-orderedlist #{component.attributes['styleClass']}"
x:passThruWithExclusions="id,class"
>
<vcp:body>
Modified: branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-05-22 16:36:40 UTC (rev 14286)
@@ -15,7 +15,7 @@
<h:styles>css/table.xcss</h:styles>
<f:clientid var="clientId"/>
<table id="#{clientId}"
- class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" >
+ class="rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" >
<f:call name="utils.encodePassThruWithExclusions">
<f:parameter value="value,name,type,id,class,rows,style" />
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -154,7 +154,7 @@
assertNotNull(dl);
assertEquals("dl", dl.getNodeName());
String classAttr = dl.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-deflist rich-deflist"));
+ assertTrue(classAttr.contains("rich-deflist"));
List dds = dl.getHtmlElementsByTagName("dd");
assertTrue(dds.size() > 0);
@@ -162,7 +162,7 @@
HtmlElement dd = (HtmlElement) dds.get(0);
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-definition rich-definition"));
+ assertTrue(classAttr.contains("rich-definition"));
}
/**
@@ -187,7 +187,7 @@
assertNotNull(dl);
assertEquals("dl", dl.getNodeName());
String classAttr = dl.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-deflist rich-deflist"));
+ assertTrue(classAttr.contains("rich-deflist"));
List dts = dl.getHtmlElementsByTagName("dt");
assertTrue(dts.size() > 0);
@@ -196,7 +196,7 @@
assertNotNull(dt);
classAttr = dt.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-definition-term rich-definition-term"));
+ .contains("rich-definition-term"));
List dds = dl.getHtmlElementsByTagName("dd");
assertTrue(dds.size() > 0);
@@ -204,7 +204,7 @@
HtmlElement dd = (HtmlElement) dds.get(0);
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-definition rich-definition"));
+ assertTrue(classAttr.contains("rich-definition"));
Iterator fixedChildren = dataList.fixedChildren();
assertNotNull(fixedChildren);
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -147,13 +147,13 @@
assertNotNull(table);
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table rich-table"));
+ assertTrue(classAttr.contains("rich-table"));
List captions = table.getHtmlElementsByTagName("caption");
assertNotNull(captions);
assertEquals(1, captions.size());
classAttr = ((HtmlElement) captions.get(0)).getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
+ assertTrue(classAttr.contains("rich-table-caption"));
List headers = table.getHtmlElementsByTagName("thead");
assertNotNull(headers);
@@ -164,7 +164,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-header rich-table-header"));
+ assertTrue(classAttr.contains("rich-table-header"));
List tds = tr.getHtmlElementsByTagName("th");
assertTrue(tds.size() > 0);
@@ -172,7 +172,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-headercell rich-table-headercell"));
+ .contains("rich-table-headercell"));
List footers = table.getHtmlElementsByTagName("tfoot");
assertNotNull(footers);
@@ -182,7 +182,7 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footer rich-table-footer"));
+ assertTrue(classAttr.contains("rich-table-footer"));
tds = tr.getHtmlElementsByTagName("td");
assertTrue(tds.size() > 0);
@@ -190,7 +190,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-footercell rich-table-footercell"));
+ .contains("rich-table-footercell"));
List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
@@ -199,7 +199,7 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-row rich-table-row"));
+ assertTrue(classAttr.contains("rich-table-row"));
assertTrue(classAttr.contains("row1"));
tds = tr.getHtmlElementsByTagName("td");
@@ -207,7 +207,7 @@
td = (HtmlElement) tds.get(0);
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
+ assertTrue(classAttr.contains("rich-table-cell"));
assertTrue(classAttr.contains("A"));
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -156,7 +156,7 @@
assertNotNull(ul);
assertEquals("ul", ul.getNodeName());
String classAttr = ul.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list rich-datalist"));
+ assertTrue(classAttr.contains("rich-datalist"));
classAttr = ul.getAttributeValue("type");
@@ -166,7 +166,7 @@
HtmlElement li = (HtmlElement) lis.get(0);
assertNotNull(li);
classAttr = li.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list-item rich-list-item"));
+ assertTrue(classAttr.contains("rich-list-item"));
}
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -156,7 +156,7 @@
assertNotNull(ol);
assertEquals("ol", ol.getNodeName());
String classAttr = ol.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list rich-orderedlist"));
+ assertTrue(classAttr.contains("rich-orderedlist"));
classAttr = ol.getAttributeValue("type");
List lis = ol.getHtmlElementsByTagName("li");
@@ -165,7 +165,7 @@
HtmlElement li = (HtmlElement) lis.get(0);
assertNotNull(li);
classAttr = li.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-list-item rich-list-item"));
+ assertTrue(classAttr.contains("rich-list-item"));
}
}
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/DataTableRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -214,7 +214,7 @@
assertNotNull(table);
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table rich-table"));
+ assertTrue(classAttr.contains("rich-table"));
List<?> elements = table.getHtmlElementsByTagName("col");
assertEquals(2, elements.size());
@@ -230,7 +230,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-firstrow rich-table-firstrow"));
+ assertTrue(classAttr.contains("rich-table-firstrow"));
classAttr = tr.getAttributeValue("onmouseover");
assertTrue(classAttr.contains("onRowMouseOver"));
for (int i = 1; i < trs.size(); i++) {
@@ -242,8 +242,6 @@
classAttr.contains("onRowMouseOver"));
classAttr = tr.getAttributeValue("class");
- assertFalse("Row i = " + i + " have 'dr-table-firstrow' style",
- classAttr.contains("dr-table-firstrow"));
assertFalse("Row i = " + i + " have 'rich-table-firstrow' style",
classAttr.contains("rich-table-firstrow"));
}
@@ -253,7 +251,7 @@
HtmlElement td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
+ assertTrue(classAttr.contains("rich-table-cell"));
}
/**
@@ -309,7 +307,7 @@
assertEquals(1, captions.size());
String classAttr = ((HtmlElement) captions.get(0))
.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
+ assertTrue(classAttr.contains("rich-table-caption"));
List<?> headers = table.getHtmlElementsByTagName("thead");
assertNotNull(headers);
@@ -319,7 +317,7 @@
HtmlElement tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-header rich-table-header"));
+ assertTrue(classAttr.contains("rich-table-header"));
Iterator<?> tds = tr.getChildIterator();
assertNotNull(tds);
@@ -327,7 +325,7 @@
HtmlElement td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-headercell rich-table-headercell"));
+ assertTrue(classAttr.contains("rich-table-headercell"));
assertTrue(classAttr.contains("cola"));
List<?> footers = table.getHtmlElementsByTagName("tfoot");
@@ -338,14 +336,14 @@
tr = (HtmlElement) trs.get(0);
assertNotNull(tr);
classAttr = tr.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footer rich-table-footer "));
+ assertTrue(classAttr.contains("rich-table-footer "));
tds = tr.getChildIterator();
assertTrue(tds.hasNext());
td = (HtmlElement) tds.next();
assertNotNull(td);
classAttr = td.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-table-footercell rich-table-footercell "));
+ assertTrue(classAttr.contains("rich-table-footercell "));
Iterator<?> fixedChildren = dataTable.fixedChildren();
assertNotNull(fixedChildren);
Modified: branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2009-05-22 16:20:55 UTC (rev 14285)
+++ branches/community/3.3.X/ui/dataTable/src/test/java/org/richfaces/renderkit/SortableHeaderRenderingTest.java 2009-05-22 16:36:40 UTC (rev 14286)
@@ -178,8 +178,7 @@
String clazz = span.getAttributeValue(HTML.class_ATTRIBUTE);
assertNotNull(clazz);
- //assertTrue(clazz.contains("dr-table-header-sort-up"));
- assertTrue(clazz.contains("dr-table-sortable-header"));
+ assertTrue(clazz.contains("rich-table-sortable-header"));
DomText text = (DomText) span.getFirstDomChild();
assertNotNull(text);
14 years, 11 months