1:20 p.m.
Author: alexsmirnov
Date: 2007-08-23 14:20:46 -0400 (Thu, 23 Aug 2007)
New Revision: 2455
Modified:
trunk/framework/impl/pom.xml
trunk/framework/pom.xml
trunk/markRelease.sh
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
Log:
Fix wrong method name ( renderedColumns instead of columns() )
Modified: trunk/framework/impl/pom.xml
===================================================================
--- trunk/framework/impl/pom.xml 2007-08-23 17:50:34 UTC (rev 2454)
+++ trunk/framework/impl/pom.xml 2007-08-23 18:20:46 UTC (rev 2455)
@@ -30,17 +30,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.1</version>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2007-08-23 17:50:34 UTC (rev 2454)
+++ trunk/framework/pom.xml 2007-08-23 18:20:46 UTC (rev 2455)
@@ -14,7 +14,6 @@
<name>Java Server Faces AJAX framework</name>
<dependencies />
<build>
- <pluginManagement>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -62,7 +61,6 @@
</configuration>
</plugin>
</plugins>
- </pluginManagement>
</build>
<modules>
<!--
Modified: trunk/markRelease.sh
===================================================================
--- trunk/markRelease.sh 2007-08-23 17:50:34 UTC (rev 2454)
+++ trunk/markRelease.sh 2007-08-23 18:20:46 UTC (rev 2455)
@@ -1,4 +1,6 @@
#!/bin/sh
+mvn scm:checkout -DconnectionType=developerConnection
+cd target/checkout
mvn release:branch -DdryRun=true -DautoVersionSubmodules=true \
-DbranchName=$1 -DupdateBranchVersions=true \
-DupdateVersionsToSnapshot=false \
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-23
17:50:34 UTC (rev 2454)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-23
18:20:46 UTC (rev 2455)
@@ -37,7 +37,7 @@
private static final String COMPONENT_FAMILY = "org.richfaces.Colgroup";
- public Iterator renderedColumns(){
+ public Iterator columns(){
return new FilterIterator(getChildren().iterator(),UIDataTable.isColumn);
}
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2007-08-23
17:50:34 UTC (rev 2454)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2007-08-23
18:20:46 UTC (rev 2455)
@@ -21,7 +21,11 @@
package org.richfaces.component;
+import java.util.Iterator;
+import org.apache.commons.collections.iterators.FilterIterator;
+
+
/**
* JSF component class
*
@@ -46,5 +50,9 @@
throw new IllegalStateException("Property 'breakBefore' for subtable is
read-only");
}
+ public Iterator columns() {
+ return new FilterIterator(getChildren().iterator(),isColumn);
+ }
+
}
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-08-23
17:50:34 UTC (rev 2454)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2007-08-23
18:20:46 UTC (rev 2455)
@@ -343,7 +343,7 @@
}
// Calculate number of columns in row.
currentLength = calculateRowColumns(((Row) column)
- .renderedColumns());
+ .columns());
// Store max calculated value
if (currentLength > count) {
count = currentLength;
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-08-23
17:50:34 UTC (rev 2454)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/ColgroupRenderer.java 2007-08-23
18:20:46 UTC (rev 2455)
@@ -71,7 +71,7 @@
if (null != columnClasses) {
classes = columnClasses.split(",");
}
- Iterator iter = colgroup.renderedColumns();
+ Iterator iter = colgroup.columns();
boolean first = true;
int currentColumn = 0;
int currentRow = 0;