JBoss Rich Faces SVN: r17377 - in root: ui/dist/trunk/richfaces-components-api and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-28 13:52:10 -0400 (Fri, 28 May 2010)
New Revision: 17377
Modified:
root/build/resources/trunk/faces-shade-transformers/pom.xml
root/ui/dist/trunk/richfaces-components-api/pom.xml
root/ui/dist/trunk/richfaces-components-impl/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Log:
Updated faces shade version to 1-SNAPSHOT
Modified: root/build/resources/trunk/faces-shade-transformers/pom.xml
===================================================================
--- root/build/resources/trunk/faces-shade-transformers/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/build/resources/trunk/faces-shade-transformers/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -1,46 +1,54 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>7</version>
</parent>
-
- <groupId>org.richfaces.build.resources</groupId>
- <artifactId>faces-shade-transformers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JSF configuration files transformers for maven-shade-plugin</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.richfaces.build.resources</groupId>
+ <artifactId>faces-shade-transformers</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>JSF configuration files transformers for maven-shade-plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.3.3</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <!-- For the release this parent pom -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/richfaces/root/build/resources/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
</project>
Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -37,7 +37,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui</assembly.projects.group>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -36,7 +36,7 @@
<name>Richfaces UI Components Impl</name>
<properties>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -36,7 +36,7 @@
<name>Richfaces UI Components UI</name>
<properties>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
<assembly.projects.group>org.richfaces.ui</assembly.projects.group>
</properties>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -37,7 +37,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -37,7 +37,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -37,7 +37,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui.iteration</assembly.projects.group>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 17:39:57 UTC (rev 17376)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 17:52:10 UTC (rev 17377)
@@ -37,7 +37,7 @@
<properties>
<assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group>
- <faces-shade-transformers.version>4.0.0-SNAPSHOT</faces-shade-transformers.version>
+ <faces-shade-transformers.version>1-SNAPSHOT</faces-shade-transformers.version>
</properties>
<dependencyManagement>
14 years, 7 months
JBoss Rich Faces SVN: r17376 - in root: ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-28 13:39:57 -0400 (Fri, 28 May 2010)
New Revision: 17376
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-8691
Modified: root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml 2010-05-28 16:47:04 UTC (rev 17375)
+++ root/examples/iteration-demo/trunk/src/main/webapp/extendedtable.xhtml 2010-05-28 17:39:57 UTC (rev 17376)
@@ -58,7 +58,7 @@
<script type="text/javascript">
<!--
function invokeJSAPI() {
- eval("document.getElementById('js_api_result').value = document.getElementById('"+ document.getElementById("js_api_id_input").value + "').component."
+ eval("document.getElementById('js_api_result').value = RichFaces.$('"+ document.getElementById("js_api_id_input").value + "')."
+ document.getElementById("js_api_function_string_input").value);
}
//-->
Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 16:47:04 UTC (rev 17375)
+++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 17:39:57 UTC (rev 17376)
@@ -298,7 +298,8 @@
jQuery(element).bind("rich:onajaxcomplete", ajaxComplete);
//JS API
- element.component = this;
+ element["richfaces"] = element["richfaces"] || {}; // TODO ExtendedDataTable should extend richfaces.BaseComponent instead of using it.
+ element.richfaces.component = this;
this.getColumnPosition = function(id) {
var position;
14 years, 7 months
JBoss Rich Faces SVN: r17375 - in root: examples/richfaces-showcase/trunk and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 12:47:04 -0400 (Fri, 28 May 2010)
New Revision: 17375
Added:
root/ui/core/trunk/ui/
Removed:
root/ui/core/trunk/api/
Modified:
root/examples/core-demo/trunk/pom.xml
root/examples/richfaces-showcase/trunk/pom.xml
root/ui/core/trunk/bom/pom.xml
root/ui/core/trunk/pom.xml
root/ui/core/trunk/ui/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/misc/trunk/componentcontrol/pom.xml
Log:
richfaces-ui-core-api renamed into richfaces-ui-core-ui
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/examples/core-demo/trunk/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
Modified: root/ui/core/trunk/bom/pom.xml
===================================================================
--- root/ui/core/trunk/bom/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/ui/core/trunk/bom/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/ui/core/trunk/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -39,6 +39,6 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>api</module>
+ <module>ui</module>
</modules>
</project>
\ No newline at end of file
Copied: root/ui/core/trunk/ui (from rev 17373, root/ui/core/trunk/api)
Modified: root/ui/core/trunk/ui/pom.xml
===================================================================
--- root/ui/core/trunk/api/pom.xml 2010-05-28 16:12:14 UTC (rev 17373)
+++ root/ui/core/trunk/ui/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -28,8 +28,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
- <name>Richfaces UI Components: Core API</name>
+ <artifactId>richfaces-ui-core-ui</artifactId>
+ <name>Richfaces UI Components: Core UI</name>
<packaging>jar</packaging>
<dependencies>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -70,7 +70,7 @@
<!-- artifacts for aggregation -->
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/componentcontrol/pom.xml
===================================================================
--- root/ui/misc/trunk/componentcontrol/pom.xml 2010-05-28 16:36:52 UTC (rev 17374)
+++ root/ui/misc/trunk/componentcontrol/pom.xml 2010-05-28 16:47:04 UTC (rev 17375)
@@ -47,7 +47,7 @@
<dependency>
<!-- todo remove this dependency -->
<groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui-core-api</artifactId>
+ <artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
<dependency>
14 years, 7 months
JBoss Rich Faces SVN: r17374 - root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 12:36:52 -0400 (Fri, 28 May 2010)
New Revision: 17374
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
Log:
Fixed Checkstyle problem in demo
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-28 16:12:14 UTC (rev 17373)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-28 16:36:52 UTC (rev 17374)
@@ -53,7 +53,8 @@
}
if (currentSample == null) {
currentSample = getCurrentDemo().getSamples().get(0);
- } }
+ }
+ }
return currentSample;
}
14 years, 7 months
JBoss Rich Faces SVN: r17373 - in root/ui/iteration/trunk/tables/ui/src: main/resources/META-INF/resources and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-28 12:12:14 -0400 (Fri, 28 May 2010)
New Revision: 17373
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
Log:
RF-7887
Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-28 16:10:48 UTC (rev 17372)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-28 16:12:14 UTC (rev 17373)
@@ -206,7 +206,7 @@
if (column.isRendered()) {
writer.startElement(HTML.TD_ELEM, column);
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-empty-footer-cell rich-extable-cell-width-"
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-efc rf-edt-cw-"
+ column.getId(), null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.TD_ELEM);
@@ -221,20 +221,20 @@
writer.startElement(HTML.TD_ELEM, column);
if ("header".equals(facetName)) {
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer-holder rich-extable-cell-width-"
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rsh rf-edt-cw-"
+ column.getId(), null);
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rs", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
}
writer.startElement(HTML.DIV_ELEM, column);
writer
- .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + facetName + "-cell",
- "rich-extable-cell-width-" + column.getId(), (String) column.getAttributes().get(classAttribute)),
+ .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + facetName.charAt(0) + "c",
+ "rf-edt-cw-" + column.getId(), (String) column.getAttributes().get(classAttribute)),
null);
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-" + facetName + "-cell-content", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-" + facetName.charAt(0) + "cc", null);
UIComponent facet = column.getFacet(facetName);
if (facet != null && facet.isRendered()) {
facet.encodeAll(context);
@@ -252,7 +252,7 @@
boolean columnFacetPresent = table.isColumnFacetPresent(name);
if (columnFacetPresent || "footer".equals(name)) {
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + name, (String) table
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt-" + name.charAt(0), (String) table
.getAttributes().get(name + "Class")), null);
writer.startElement(HTML.TABLE_ELEMENT, table);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
@@ -266,7 +266,7 @@
if (columns.hasNext()) {
writer.startElement(HTML.TD_ELEM, table);
if (PartName.frozen.equals(partName) && "footer".equals(name)) {
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-footer-align", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-fa", null);
}
writer.startElement(HTML.DIV_ELEM, table);
if (PartName.frozen.equals(partName)) {
@@ -276,8 +276,8 @@
}
} else {
writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable"
- + ("footer".equals(name) ? "-footer" : "") + "-part rich-extable-part-width", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-"
+ + ("footer".equals(name) ? "f" : "") + "p rf-edt-pw", null);
}
String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0);
@@ -327,7 +327,7 @@
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-header", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-th", null);
header.encodeAll(context);
writer.endElement(HTML.DIV_ELEM);
@@ -347,7 +347,7 @@
encoderVariance.encodeStartUpdate(context, tableBodyId);
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, tableBodyId, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-b", null);
if (table.getRowCount() == 0) {
UIComponent facet = table.getFacet("noData");
@@ -365,7 +365,7 @@
table.getAttributes().put("clientFirst", 0);
writer.startElement(HTML.DIV_ELEM, table);
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-spacer", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-s", null);
writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.TABLE_ELEMENT, table);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
@@ -377,7 +377,7 @@
PartName partName = state.nextPart().getName();
if (PartName.normal.equals(partName)) {
writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":body", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-part rich-extable-part-width", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-p rf-edt-pw", null);
}
String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0);
@@ -421,7 +421,7 @@
writer.startElement(HTML.DIV_ELEM, table);
writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-table-footer", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-tf", null);
footer.encodeAll(context);
writer.endElement(HTML.DIV_ELEM);
@@ -560,7 +560,7 @@
Map<String, Object> attributes = component.getAttributes();
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context), null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable", (String) attributes.get("styleClass")), null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rf-edt", (String) attributes.get("styleClass")), null);
getUtils().writeAttribute(writer, HTML.STYLE_ATTRIBUTE, attributes.get("style"));
}
@@ -587,11 +587,11 @@
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-drag", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-d", null);
writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.TABLE_ELEMENT, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":r", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-reorder", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-ro", null);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
writer.startElement(HTML.TR_ELEMENT, component);
@@ -609,7 +609,7 @@
writer.endElement(HTML.TABLE_ELEMENT);
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":rm", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-reorder-marker", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-rom", null);
writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null);
@@ -649,7 +649,7 @@
UIDataTableBase table = state.getRow();
writer.startElement("style", table);
writer.writeAttribute(HTML.TYPE_ATTR, "text/css", null);
- writer.writeText(".rich-extable-part-width{", null); // TODO getNormalizedId(context, state.getGrid())
+ writer.writeText(".rf-edt-pw {", null); // TODO getNormalizedId(context, state.getGrid())
writer.writeText("width: 100%;", "width");
writer.writeText("}", null);
Iterator<UIComponent> columns = table.columns();
@@ -661,7 +661,7 @@
id = column.getId();
}
String width = getColumnWidth(column);
- writer.writeText(".rich-extable-cell-width-" + id + " {", "width"); // TODO getNormalizedId(context,
+ writer.writeText(".rf-edt-cw-" + id + " {", "width"); // TODO getNormalizedId(context,
writer.writeText("width: " + width + ";", "width");
writer.writeText("}", "width");
}
@@ -682,10 +682,10 @@
if (column.isRendered()) {
writer.startElement(HTML.TD_ELEM, table);
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-cell rich-extable-cell-width-"
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-c rf-edt-cw-"
+ column.getId(), null);
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-cell-content", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rf-edt-cc", null);
renderChildren(facesContext, column);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-28 16:10:48 UTC (rev 17372)
+++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.ecss 2010-05-28 16:12:14 UTC (rev 17373)
@@ -19,83 +19,83 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-.rich-extable{
+.rf-edt {
overflow: hidden;
background-color: '#{richSkin.tableBackgroundColor}';
border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
/*height: 100%;*/
}
-.rich-extable-header, .rich-extable-table-header {
- background-color : '#{richSkin.tableHeaderBackgroundColor}';
+.rf-edt-h, .rf-edt-th {
+ background-color: '#{richSkin.tableHeaderBackgroundColor}';
}
-.rich-extable-table-header {
+.rf-edt-th {
border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
}
-.rich-extable-body{
+.rf-edt-b {
overflow-x: hidden;
overflow-y: auto;
width: 100%;
}
-.rich-extable-spacer {
+.rf-edt-s {
height: 0px;
/*font-size: 0px;
line-height: 0px;*/
}
-.rich-extable-footer, .rich-extable-table-footer {
+.rf-edt-f, .rf-edt-tf {
border-top: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
background-color: '#{richSkin.tableFooterBackgroundColor}';
}
-.rich-extable-footer-align{
+.rf-edt-fa {
vertical-align: top;
}
-.rich-extable-part{
+.rf-edt-p {
overflow: hidden;
}
-.rich-extable-footer-part{
+.rf-edt-fp {
overflow-x: auto;
overflow-y: visible;
}
-.rich-extable-resizer-holder {
+.rf-edt-rsh {
left : 0px;
position: relative;
height: 0px;
}
-.rich-extable-resizer {
+.rf-edt-rs {
background-image: url("#{resource['spacer.gif']}");
- cursor:e-resize;
- height:20px; /*TODO*/
- position:absolute;
+ cursor: e-resize;
+ height: 20px; /*TODO*/
+ position: absolute;
left: 100%;
margin-left: -3px;
- width:6px;
+ width: 6px;
}
-.rich-extable-drag{
- cursor:e-resize;
- position:absolute;
+.rf-edt-d {
+ cursor: e-resize;
+ position: absolute;
border-left: '1px dotted #{richSkin.generalTextColor}';
/*background-color: #848089;*/
- width:1px;
+ width: 1px;
display: none;
}
-.rich-extable-reorder{
- position:absolute;
+.rf-edt-ro {
+ position: absolute;
border-collapse: collapse;
display: none;
}
-.rich-extable-reorder th{
+.rf-edt-ro th {
width: 20px;
height: 5px;
font-size: 1px;
@@ -103,7 +103,7 @@
border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
}
-.rich-extable-reorder td{
+.rf-edt-ro td {
width: 20px;
height: 5px;
font-size: 1px;
@@ -111,44 +111,44 @@
border: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
}
-.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{
+.rf-edt-c, .rf-edt-hc, .rf-edt-fc {
height: 20px;
overflow: hidden;
border-bottom: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
}
-.rich-extable-empty-footer-cell{
+.rf-edt-efc {
border-right: '#{richSkin.tableBorderWidth} solid #{richSkin.tableBorderColor}';
height: 1px;
}
-.rich-extable-cell-content, .rich-extable-header-cell-content, .rich-extable-footer-cell-content, .rich-extable-table-header, .rich-extable-table-footer{
+.rf-edt-cc, .rf-edt-hcc, .rf-edt-fcc, .rf-edt-th, .rf-edt-tf {
padding: 3px 7px;
white-space: nowrap;
font-family: '#{richSkin.generalFamilyFont}';
font-size: '#{richSkin.generalSizeFont}';
}
-.rich-extable-header-cell-content, .rich-extable-table-header {
- font-weight:bold;
- color : '#{richSkin.tableHeaderTextColor}';
+.rf-edt-hcc, .rf-edt-th {
+ font-weight: bold;
+ color: '#{richSkin.tableHeaderTextColor}';
}
-.rich-extable-footer-cell-content, .rich-extable-table-footer {
- font-weight:bold;
+.rf-edt-fcc, .rf-edt-tf {
+ font-weight: bold;
color: '#{richSkin.generalTextColor}';
}
-.rich-extable-cell-content {
+.rf-edt-cc {
color: '#{richSkin.generalTextColor}';
}
-.rich-extable-reorder-marker {
- position:absolute;
+.rf-edt-rom {
+ position: absolute;
height: 9px;
font-size: 9px;
- width:9px;
+ width: 9px;
background-image: url("#{resource['reorderMarker.gif']}");
display: none;
}
\ No newline at end of file
Modified: root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 16:10:48 UTC (rev 17372)
+++ root/ui/iteration/trunk/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-28 16:12:14 UTC (rev 17373)
@@ -35,7 +35,7 @@
};
richfaces.ExtendedDataTable = function(id, rowCount, ajaxFunction, ajaxParameters) {
- var WIDTH_CLASS_NAME_BASE = "rich-extable-cell-width-";
+ var WIDTH_CLASS_NAME_BASE = "rf-edt-cw-";
var MIN_WIDTH = 20;
var element = document.getElementById(id);
@@ -44,9 +44,9 @@
var reorderElement = document.getElementById(id + ":r");
var reorderMarkerElement = document.getElementById(id + ":rm");
var widthInput = document.getElementById(id + ":wi");
- var normalPartStyle = richfaces.getCSSRule(".rich-extable-part-width").style;
- var header = jQuery(element).children(".rich-extable-header");
- var resizerHolders = header.find(".rich-extable-resizer-holder").get();
+ var normalPartStyle = richfaces.getCSSRule(".rf-edt-pw").style;
+ var header = jQuery(element).children(".rf-edt-h");
+ var resizerHolders = header.find(".rf-edt-rsh").get();
var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader");
var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant;
@@ -157,7 +157,7 @@
spacerElement = null;
dataTableElement = null;
}
- parts = jQuery(element).find(".rich-extable-part");
+ parts = jQuery(element).find(".rf-edt-p");
updateLayout();
updateScrollPosition(); //TODO Restore horizontal scroll position
};
@@ -211,7 +211,7 @@
var beginReorder = function(event) {
idOfReorderingColumn = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
jQuery(document).bind("mousemove", reorder);
- header.find(".rich-extable-header-cell").bind("mouseover", overReorder);
+ header.find(".rf-edt-hc").bind("mouseover", overReorder);
jQuery(document).one("mouseup", cancelReorder);
return false;
};
@@ -235,7 +235,7 @@
jQuery(this).unbind("mouseout", outReorder);
var id = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
var colunmsOrder = "";
- header.find(".rich-extable-header-cell").each(function() {
+ header.find(".rf-edt-hc").each(function() {
var i = this.className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
if (i == id) {
colunmsOrder += idOfReorderingColumn + "," + id + ",";
@@ -248,7 +248,7 @@
var cancelReorder = function(event) {
jQuery(document).unbind("mousemove", reorder);
- header.find(".rich-extable-header-cell").unbind("mouseover", overReorder);
+ header.find(".rf-edt-hc").unbind("mouseover", overReorder);
reorderElement.style.display = "none";
};
@@ -290,8 +290,8 @@
jQuery(window).bind("resize", updateLayout);
jQuery(scrollElement).bind("scroll", updateScrollPosition);
var bindHeaderHandlers = function () {
- header.find(".rich-extable-resizer").bind("mousedown", beginResize);
- header.find(".rich-extable-header-cell").bind("mousedown", beginReorder);
+ header.find(".rf-edt-rs").bind("mousedown", beginResize);
+ header.find(".rf-edt-hc").bind("mousedown", beginReorder);
}
bindHeaderHandlers();
jQuery(bodyElement).bind("scroll", bodyScrollListener);
@@ -302,7 +302,7 @@
this.getColumnPosition = function(id) {
var position;
- var headers = header.find(".rich-extable-header-cell");
+ var headers = header.find(".rf-edt-hc");
for (var i = 0; i < headers.length; i++) {
if (id == headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1]) {
position = i;
@@ -314,7 +314,7 @@
this.setColumnPosition = function(id, position) {
var colunmsOrder = "";
var before;
- var headers = header.find(".rich-extable-header-cell");
+ var headers = header.find(".rf-edt-hc");
for (var i = 0; i < headers.length; i++) {
var current = headers.get(i).className.match(new RegExp(WIDTH_CLASS_NAME_BASE + "([^\\W]*)"))[1];
if (i == position) {
Modified: root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-28 16:10:48 UTC (rev 17372)
+++ root/ui/iteration/trunk/tables/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-28 16:12:14 UTC (rev 17373)
@@ -87,7 +87,7 @@
public final void testDoEncodeBegin() throws IOException {
HtmlPage page = environment.getPage("/extendedDataTableTest.jsf");
HtmlElement table = page.getElementById("table");
- assertEquals("rich-extable", table.getAttribute("class"));
+ assertEquals("rf-edt", table.getAttribute("class"));
assertEquals("headerFacet", table.getElementById("table:headerFacet").getTextContent());
}
@@ -103,36 +103,36 @@
HtmlPage page = environment.getPage("/extendedDataTableTest.jsf");
HtmlElement table = page.getElementById("table");
String text = table.getElementsByTagName("style").get(0).getTextContent();
- assertTrue(text.contains("rich-extable-part-width"));
- assertTrue(text.contains("rich-extable-cell-width"));
- HtmlElement header = table.getFirstByXPath("div[@class='rich-extable-header']");
+ assertTrue(text.contains("rf-edt-pw"));
+ assertTrue(text.contains("rf-edt-cw"));
+ HtmlElement header = table.getFirstByXPath("div[@class='rf-edt-h']");
HtmlElement frozenHeader = header.getElementById("table:frozenHeader");
HtmlElement normalHeader = header.getElementById("table:header");
- assertTrue(normalHeader.getAttribute("class").contains("rich-extable-part-width"));
- assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rich-extable-resizer']"));
- assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rich-extable-resizer']"));
+ assertTrue(normalHeader.getAttribute("class").contains("rf-edt-pw"));
+ assertNotNull(frozenHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']"));
+ assertNotNull(normalHeader.getFirstByXPath("descendant::*[@class='rf-edt-rs']"));
assertEquals("headerColumnFacet1", ((HtmlElement) frozenHeader
- .getFirstByXPath("//*[@class='rich-extable-header-cell-content']//*[@id='table:headerColumnFacet1']"))
+ .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet1']"))
.getTextContent());
assertEquals("headerColumnFacet2", ((HtmlElement) normalHeader
- .getFirstByXPath("//*[@class='rich-extable-header-cell-content']//*[@id='table:headerColumnFacet2']"))
+ .getFirstByXPath("//*[@class='rf-edt-hcc']//*[@id='table:headerColumnFacet2']"))
.getTextContent());
HtmlElement body = table.getElementById("table:b");
- assertEquals("rich-extable-body", body.getAttribute("class"));
- assertNotNull(body.getFirstByXPath("descendant::*[@class='rich-extable-spacer']"));
+ assertEquals("rf-edt-b", body.getAttribute("class"));
+ assertNotNull(body.getFirstByXPath("descendant::*[@class='rf-edt-s']"));
assertNotNull(body
- .getFirstByXPath("descendant::*[@class='rich-extable-part rich-extable-part-width']//*[@id='table:tbn']"));
+ .getFirstByXPath("descendant::*[@class='rf-edt-p rf-edt-pw']//*[@id='table:tbn']"));
assertEquals("noDataFacet", ((HtmlElement) page
.getFirstByXPath("//*[@id='table2']//*[@id='table2:b']//*[@id='table2:noDataFacet']")).getTextContent());
- HtmlElement footer = table.getFirstByXPath("div[@class='rich-extable-footer']");
- HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rich-extable-footer-align']/div");
+ HtmlElement footer = table.getFirstByXPath("div[@class='rf-edt-f']");
+ HtmlElement frozenFooter = footer.getFirstByXPath("descendant::*[@class='rf-edt-fa']/div");
HtmlElement normalFooter = footer.getElementById("table:footer");
- assertTrue(normalFooter.getAttribute("class").contains("rich-extable-part-width"));
+ assertTrue(normalFooter.getAttribute("class").contains("rf-edt-pw"));
assertEquals("footerColumnFacet1", ((HtmlElement) frozenFooter
- .getFirstByXPath("descendant::*[@class='rich-extable-footer-cell-content']//*[@id='table:footerColumnFacet1']"))
+ .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet1']"))
.getTextContent());
assertEquals("footerColumnFacet2", ((HtmlElement) normalFooter
- .getFirstByXPath("descendant::*[@class='rich-extable-footer-cell-content']//*[@id='table:footerColumnFacet2']"))
+ .getFirstByXPath("descendant::*[@class='rf-edt-fcc']//*[@id='table:footerColumnFacet2']"))
.getTextContent());
}
@@ -148,9 +148,9 @@
HtmlPage page = environment.getPage("/extendedDataTableTest.jsf");
HtmlElement table = page.getElementById("table");
assertEquals("footerFacet", table.getElementById("table:footerFacet").getTextContent());
- assertEquals("rich-extable-drag", table.getElementById("table:d").getAttribute("class"));
- assertEquals("rich-extable-reorder", table.getElementById("table:r").getAttribute("class"));
- assertEquals("rich-extable-reorder-marker", table.getElementById("table:rm").getAttribute("class"));
+ assertEquals("rf-edt-d", table.getElementById("table:d").getAttribute("class"));
+ assertEquals("rf-edt-ro", table.getElementById("table:r").getAttribute("class"));
+ assertEquals("rf-edt-rom", table.getElementById("table:rm").getAttribute("class"));
assertEquals("table:wi", table.getElementById("table:wi").getAttribute("name"));
assertTrue(table.getElementsByTagName("script").get(0).getTextContent()
.contains("RichFaces.ExtendedDataTable"));
@@ -167,9 +167,9 @@
HtmlPage page = environment.getPage("/extendedDataTableTest.jsf");
HtmlElement table = page.getElementById("table");
HtmlElement cell = table.getElementById("table:0:f").getElementsByTagName("div").get(0);
- assertTrue(cell.getAttribute("class").contains("rich-extable-cell"));
+ assertTrue(cell.getAttribute("class").contains("rf-edt-c"));
HtmlElement cellContent = cell.getElementsByTagName("div").get(0);
- assertEquals("rich-extable-cell-content", cellContent.getAttribute("class"));
+ assertEquals("rf-edt-cc", cellContent.getAttribute("class"));
assertEquals("value", cellContent.getElementById("table:0:outputText").getTextContent());
}
14 years, 7 months
JBoss Rich Faces SVN: r17372 - in root/ui/iteration/trunk/tables: ui/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 12:10:48 -0400 (Fri, 28 May 2010)
New Revision: 17372
Added:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java
Removed:
root/ui/iteration/trunk/tables/api/src/main/java/org/richfaces/renderkit/
Log:
Small refactoring in tables submodule
Copied: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java (from rev 17368, root/ui/iteration/trunk/tables/api/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java)
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java (rev 0)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/HeaderEncodeStrategy.java 2010-05-28 16:10:48 UTC (rev 17372)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, 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.renderkit;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+public interface HeaderEncodeStrategy {
+
+
+ public abstract void encodeBegin(FacesContext context, ResponseWriter writer,
+ UIComponent column, String facetName) throws IOException;
+
+ public abstract void encodeEnd(FacesContext context, ResponseWriter writer,
+ UIComponent column, String facetName) throws IOException;
+
+}
Copied: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java (from rev 17368, root/ui/iteration/trunk/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java)
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java (rev 0)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-05-28 16:10:48 UTC (rev 17372)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, 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.renderkit;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.component.Row;
+
+public abstract class RowHolderBase {
+
+ private FacesContext context;
+
+ private int currentRow;
+
+ private boolean partialUpdate;
+
+ public RowHolderBase(FacesContext context) {
+ this(context, 0);
+ }
+
+ public RowHolderBase(FacesContext context, int currentRow) {
+ this.context = context;
+ this.currentRow = currentRow;
+ }
+
+ public boolean isPartialUpdate() {
+ return partialUpdate;
+ }
+
+ public void setPartialUpdate(boolean partialUpdate) {
+ this.partialUpdate = partialUpdate;
+ }
+
+ public FacesContext getContext() {
+ return context;
+ }
+
+ public abstract Row getRow();
+
+ public int getCurrentRow() {
+ return currentRow;
+ }
+
+ public int nextRow() {
+ return ++currentRow;
+ }
+
+ public void setCurrentRow(int currentRow) {
+ this.currentRow = currentRow;
+ }
+
+ public void resetCurrentRow() {
+ this.currentRow = 0;
+ }
+}
14 years, 7 months
JBoss Rich Faces SVN: r17371 - root/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 11:33:29 -0400 (Fri, 28 May 2010)
New Revision: 17371
Modified:
root/examples/pom.xml
Log:
Added Log4J dependency for examples
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-28 15:30:17 UTC (rev 17370)
+++ root/examples/pom.xml 2010-05-28 15:33:29 UTC (rev 17371)
@@ -76,6 +76,13 @@
<artifactId>slf4j-simple</artifactId>
<version>1.5.8</version>
</dependency>
+
+ <!-- Log4J dependency used in examples -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
</dependencies>
</dependencyManagement>
14 years, 7 months
JBoss Rich Faces SVN: r17370 - in root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo: model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 11:30:17 -0400 (Fri, 28 May 2010)
New Revision: 17370
Modified:
root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/DataBean.java
root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Company.java
root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Employee.java
root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java
Log:
Fixed CheckStyle violations in iteration-demo
Modified: root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/DataBean.java
===================================================================
--- root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/DataBean.java 2010-05-28 15:23:13 UTC (rev 17369)
+++ root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/DataBean.java 2010-05-28 15:30:17 UTC (rev 17370)
@@ -16,21 +16,26 @@
@ManagedBean(name="dataBean")
@SessionScoped
public class DataBean {
-
+
DataComponentState dataTableState;
-
+
Map<Object,Integer> stateMap = new HashMap<Object, Integer>();
-
+
+ int page = 1;
+
private String test1 = "test1";
-
+
private String test2 = "test2";
-
+
private String target = "targetId";
-
+
private String operation = "operation";
-
+
private boolean rendered = true;
-
+
+ private List<Employee> employeeList;
+ private boolean state = true;
+
public String getTarget() {
return target;
}
@@ -63,9 +68,7 @@
this.test2 = test2;
}
- int page = 1;
-
- public int getPage() {
+ public int getPage() {
return page;
}
@@ -89,36 +92,33 @@
this.dataTableState = dataTableState;
}
- private List<Employee> employeeList;
- private boolean state = true;
-
public void setEmployeeList(List<Employee> employeeList) {
- this.employeeList = employeeList;
- }
+ this.employeeList = employeeList;
+ }
- public List<Employee> getEmployeeList() {
- if(employeeList == null){
- employeeList = EmployeeUtils.obtainDefaultEmployeeList();
- }
- return employeeList;
- }
+ public List<Employee> getEmployeeList() {
+ if(employeeList == null){
+ employeeList = EmployeeUtils.obtainDefaultEmployeeList();
+ }
+ return employeeList;
+ }
- public boolean isState() {
- return state;
- }
+ public boolean isState() {
+ return state;
+ }
- public void setState(boolean state) {
- this.state = state;
- }
-
- public void sortingListener(SortingEvent event) {
- System.out.println(event.getSortOrder());
- }
-
- public Date getDate() {
- return new Date();
- }
+ public void setState(boolean state) {
+ this.state = state;
+ }
+ public void sortingListener(SortingEvent event) {
+ System.out.println(event.getSortOrder());
+ }
+
+ public Date getDate() {
+ return new Date();
+ }
+
public void setRendered(boolean rendered) {
this.rendered = rendered;
}
Modified: root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Company.java
===================================================================
--- root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Company.java 2010-05-28 15:23:13 UTC (rev 17369)
+++ root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Company.java 2010-05-28 15:30:17 UTC (rev 17370)
@@ -4,56 +4,56 @@
public class Company {
- private String name;
+ private String name;
- private String state;
+ private String state;
- private String phone;
-
+ private String phone;
- public Company(String name) {
- this.name = name;
- }
- public String getName() {
- return name;
- }
+ public Company(String name) {
+ this.name = name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return name;
+ }
- public String getState() {
- return state;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setState(String state) {
- this.state = state;
- }
+ public String getState() {
+ return state;
+ }
- public String getPhone() {
- return phone;
- }
+ public void setState(String state) {
+ this.state = state;
+ }
- public void setPhone(String phone) {
- this.phone = phone;
- }
+ public String getPhone() {
+ return phone;
+ }
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Company)) {
- return false;
- }
- Company company = (Company) obj;
- return name.equals(company.getName());
- }
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
- @Override
- public int hashCode() {
- return 31 + 17 * name.hashCode();
- }
-
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Company)) {
+ return false;
+ }
+ Company company = (Company) obj;
+ return name.equals(company.getName());
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 + 17 * name.hashCode();
+ }
+
}
Modified: root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Employee.java
===================================================================
--- root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Employee.java 2010-05-28 15:23:13 UTC (rev 17369)
+++ root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/model/Employee.java 2010-05-28 15:30:17 UTC (rev 17370)
@@ -8,59 +8,58 @@
public class Employee {
- private String name;
+ private static String[] phoneNames = {"Cell phone", "Work phone", "Home phone"};
- private String title;
+ private String name;
- private List <Company> companies;
+ private String title;
- private String eMail;
-
- private boolean expand;
+ private List <Company> companies;
+ private String eMail;
- private List<String[]> phones = new ArrayList<String[]>();
-
- private static String[] phoneNames = {"Cell phone", "Work phone", "Home phone"};
-
- public Employee(String name, String title) {
- this.name = name;
- this.title = title;
- initPhones();
- }
+ private boolean expand;
- private void initPhones() {
- Random random = new Random();
- int count = random.nextInt(phoneNames.length + 1);
- for (int i = 0; i < count; i++) {
- phones.add(new String[]{phoneNames[i], "+" + random.nextInt(1000) + "-" + random.nextInt(1000000000)});
- }
- }
-
- public String getTitle() {
- return title;
- }
+ private List<String[]> phones = new ArrayList<String[]>();
- public void setTitle(String title) {
- this.title = title;
- }
+ public Employee(String name, String title) {
+ this.name = name;
+ this.title = title;
+ initPhones();
+ }
- public String getName() {
- return name;
- }
+ private void initPhones() {
+ Random random = new Random();
+ int count = random.nextInt(phoneNames.length + 1);
+ for (int i = 0; i < count; i++) {
+ phones.add(new String[]{phoneNames[i], "+" + random.nextInt(1000) + "-" + random.nextInt(1000000000)});
+ }
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getTitle() {
+ return title;
+ }
- public List <Company> getCompanies() {
- return companies;
- }
+ public void setTitle(String title) {
+ this.title = title;
+ }
- public void setCompanies(List<Company> companies) {
- this.companies = companies;
- }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List <Company> getCompanies() {
+ return companies;
+ }
+
+ public void setCompanies(List<Company> companies) {
+ this.companies = companies;
+ }
+
public String getEMail() {
return eMail;
}
@@ -69,48 +68,48 @@
this.eMail = eMail;
}
- public void setPhones(List<String[]> phones) {
- this.phones = phones;
- }
+ public void setPhones(List<String[]> phones) {
+ this.phones = phones;
+ }
- public List<String[]> getPhones() {
- return phones;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Employee)) {
- return false;
- }
- Employee employee = (Employee) obj;
- return name.equals(employee.getName())
- && title.equals(employee.getTitle())
- && (companies == null ? employee.getCompanies() == null : companies
- .equals(employee.getCompanies()));
- }
+ public List<String[]> getPhones() {
+ return phones;
+ }
- @Override
- public int hashCode() {
- int hash = 1;
- hash = hash * 17 + name.hashCode();
- hash = hash * 17 + title.hashCode();
- hash = hash * 17 + (companies == null ? 0 : companies.hashCode());
- return hash;
- }
-
- public void toggle(ToggleEvent event) {
- this.expand = event.isExpanded();
- }
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof Employee)) {
+ return false;
+ }
+ Employee employee = (Employee) obj;
+ return name.equals(employee.getName())
+ && title.equals(employee.getTitle())
+ && (companies == null ? employee.getCompanies() == null : companies
+ .equals(employee.getCompanies()));
+ }
- public boolean isExpand() {
- return expand;
- }
+ @Override
+ public int hashCode() {
+ int hash = 1;
+ hash = hash * 17 + name.hashCode();
+ hash = hash * 17 + title.hashCode();
+ hash = hash * 17 + (companies == null ? 0 : companies.hashCode());
+ return hash;
+ }
- public void setExpand(boolean expand) {
- this.expand = expand;
- }
+ public void toggle(ToggleEvent event) {
+ this.expand = event.isExpanded();
+ }
+ public boolean isExpand() {
+ return expand;
+ }
+
+ public void setExpand(boolean expand) {
+ this.expand = expand;
+ }
+
}
\ No newline at end of file
Modified: root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java
===================================================================
--- root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java 2010-05-28 15:23:13 UTC (rev 17369)
+++ root/examples/iteration-demo/trunk/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java 2010-05-28 15:30:17 UTC (rev 17370)
@@ -1,20 +1,22 @@
package org.richfaces.demo.utils;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import org.richfaces.demo.model.Company;
import org.richfaces.demo.model.Employee;
-public class EmployeeUtils {
+public final class EmployeeUtils {
+ private EmployeeUtils() {
+ }
+
public static List<Employee> obtainDefaultEmployeeList() {
List<Employee> employeeList = new ArrayList<Employee>();
addEmployeeToCollection(employeeList, "9Alexander Ivanov", "Director", "aivanov(a)beltelecom.by", "AMicrosoft", "+375 29 255 00 00", "Minsk, Belarus");
- addEmployeeToCollection(employeeList, "4Bill Gates", "President", "bgates(a)microsoft.com", "AMicrosoft", "817-335-5881", "Tokyo, Japan");
+ addEmployeeToCollection(employeeList, "4Bill Gates", "President", "bgates(a)microsoft.com", "AMicrosoft", "817-335-5881", "Tokyo, Japan");
addEmployeeToCollection(employeeList, "Amanda Gellhouse", "IT/Internet Support; Manager", "agellhouse(a)sun.com", "Sun", "853-729-3784", "Sun Valley, USA");
addEmployeeToCollection(employeeList, "2Hideo Kodzima", "Vice Prezident", "khideo(a)konami.jp", "AMicrosoft", "419-615-2730", "Tokyo, Japan");
addEmployeeToCollection(employeeList, "3Stan Carpenter", "Lead Designer", "scarpenter(a)ndogs.com", "AMicrosoft", "714-647-3380", "Tokyo, Japan");
14 years, 7 months
JBoss Rich Faces SVN: r17369 - in root/ui/iteration/trunk/datascroller/ui/src/main: resources/META-INF/resources/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-05-28 11:23:13 -0400 (Fri, 28 May 2010)
New Revision: 17369
Modified:
root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss
root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml
Log:
fix styles, RF-8702
Modified: root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-28 15:05:10 UTC (rev 17368)
+++ root/ui/iteration/trunk/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-05-28 15:23:13 UTC (rev 17369)
@@ -69,6 +69,8 @@
public static final String PAGEMODE_FULL = "full";
public static final String PAGEMODE_SHORT = "short";
+
+ private static final int MAX_PAGES_DEFAULT = 10;
private Integer page;
@@ -101,7 +103,7 @@
}
public int getMaxPages() {
- return (Integer) getStateHelper().eval(PropertyKeys.maxPages, 0);
+ return (Integer) getStateHelper().eval(PropertyKeys.maxPages, MAX_PAGES_DEFAULT);
}
public void setMaxPages(int maxPages) {
Modified: root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-28 15:05:10 UTC (rev 17368)
+++ root/ui/iteration/trunk/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.ecss 2010-05-28 15:23:13 UTC (rev 17369)
@@ -1,3 +1,12 @@
+.rf-ds{
+ white-space:nowrap;
+ display:inline-block;
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:1px;
+ font-family:'#{richSkin.generalFamilyFont}';
+ background:'#{richSkin.tableBackgroundColor}';
+}
+
a.rf-ds-dtl {
color: '#{richSkin.generalTextColor}';
}
Modified: root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml 2010-05-28 15:05:10 UTC (rev 17368)
+++ root/ui/iteration/trunk/datascroller/ui/src/main/templates/datascroller.template.xml 2010-05-28 15:23:13 UTC (rev 17369)
@@ -16,7 +16,7 @@
<cdk:object type="org.richfaces.renderkit.ControlsState" name="controlsState" value="#{getControlsState(facesContext,component)}" />
- <span id="#{clientId}" class="ds_container !ds_container_decor"><!-- Now decor is disabled !!! -->
+ <span id="#{clientId}" class="rf-ds"><!-- Now decor is disabled !!! -->
<c:if test="#{controlsState.firstRendered}">
<c:choose>
<c:when test="#{controlsState.firstEnabled}">
14 years, 7 months