JBoss Rich Faces SVN: r10529 - in trunk/test-applications/regressionArea: Seam-ear and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-22 10:51:59 -0400 (Mon, 22 Sep 2008)
New Revision: 10529
Modified:
trunk/test-applications/regressionArea/Seam-ear/
trunk/test-applications/regressionArea/Seam-ejb/
trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/components.properties
trunk/test-applications/regressionArea/Seam-web/
trunk/test-applications/regressionArea/Seam-web/pom.xml
trunk/test-applications/regressionArea/pom.xml
Log:
refactor
Property changes on: trunk/test-applications/regressionArea/Seam-ear
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: trunk/test-applications/regressionArea/Seam-ejb
___________________________________________________________________
Name: svn:ignore
+ target
Modified: trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/components.properties
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/components.properties 2008-09-22 14:50:21 UTC (rev 10528)
+++ trunk/test-applications/regressionArea/Seam-ejb/src/main/resources/components.properties 2008-09-22 14:51:59 UTC (rev 10529)
@@ -1,4 +1,4 @@
#
#Wed Feb 27 12:58:12 EET 2008
-jndiPattern=Seam-ear-1.0-SNAPSHOT/#{ejbName}/local
+jndiPattern=Seam-ear-3.3.0-SNAPSHOT/#{ejbName}/local
embeddedEjb=true
Property changes on: trunk/test-applications/regressionArea/Seam-web
___________________________________________________________________
Name: svn:ignore
+ target
Modified: trunk/test-applications/regressionArea/Seam-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-22 14:50:21 UTC (rev 10528)
+++ trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-22 14:51:59 UTC (rev 10529)
@@ -87,7 +87,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <!--skip>true</skip-->
<source>1.5</source>
<target>1.5</target>
</configuration>
@@ -110,7 +110,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
- <inherited>false</inherited>
<configuration>
<skip>true</skip>
</configuration>
Modified: trunk/test-applications/regressionArea/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/pom.xml 2008-09-22 14:50:21 UTC (rev 10528)
+++ trunk/test-applications/regressionArea/pom.xml 2008-09-22 14:51:59 UTC (rev 10529)
@@ -1,14 +1,15 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <!--parent>
<groupId>org.richfaces</groupId>
<artifactId>samples</artifactId>
<version>3.3.0-SNAPSHOT</version>
- </parent>
+ </parent-->
<groupId>org.richfaces.test-applications</groupId>
<artifactId>regressionArea</artifactId>
<packaging>pom</packaging>
+ <version>3.3.0-SNAPSHOT</version>
<name>Regresion Area:Seam Application</name>
<repositories>
<repository>
16 years, 3 months
JBoss Rich Faces SVN: r10528 - trunk/test-applications/regressionArea/Seam-ear.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-22 10:50:21 -0400 (Mon, 22 Sep 2008)
New Revision: 10528
Modified:
trunk/test-applications/regressionArea/Seam-ear/pom.xml
Log:
refactor
Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-22 14:26:52 UTC (rev 10527)
+++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-22 14:50:21 UTC (rev 10528)
@@ -20,14 +20,12 @@
<artifactId>Seam-web</artifactId>
<version>${project.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
<type>ejb</type>
- <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>el-api</artifactId>
@@ -56,7 +54,6 @@
<artifactId>Seam-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
- <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
16 years, 3 months
JBoss Rich Faces SVN: r10527 - trunk/test-applications/regressionArea/Seam-ear/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-22 10:26:52 -0400 (Mon, 22 Sep 2008)
New Revision: 10527
Removed:
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/antlr-runtime.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/drools-compiler.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/drools-core.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jboss-el.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jboss-seam.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jbpm-jpdl.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/mvel14.jar
trunk/test-applications/regressionArea/Seam-ear/src/main/resources/richfaces-api.jar
Log:
Remove jars from Repo
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/antlr-runtime.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/drools-compiler.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/drools-core.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jboss-el.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jboss-seam.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/jbpm-jpdl.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/mvel14.jar
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/regressionArea/Seam-ear/src/main/resources/richfaces-api.jar
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10526 - in trunk/test-applications/regressionArea: Seam-ear and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-09-22 10:22:44 -0400 (Mon, 22 Sep 2008)
New Revision: 10526
Modified:
trunk/test-applications/regressionArea/Seam-ear/pom.xml
trunk/test-applications/regressionArea/Seam-ejb/pom.xml
trunk/test-applications/regressionArea/Seam-web/pom.xml
trunk/test-applications/regressionArea/pom.xml
Log:
Define org.richfaces.samples as parent project
Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-22 12:43:48 UTC (rev 10525)
+++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-22 14:22:44 UTC (rev 10526)
@@ -6,9 +6,9 @@
<parent>
<groupId>org.richfaces.test-applications</groupId>
<artifactId>regressionArea</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ear</artifactId>
<name>Seam App Ear Module</name>
@@ -18,15 +18,16 @@
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-web</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
- <!-- EJB -->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
<type>ejb</type>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>el-api</artifactId>
@@ -53,8 +54,9 @@
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ejb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>ejb</type>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
@@ -96,12 +98,15 @@
</dependency>
</dependencies>
+
+
<build>
<finalName>${earname}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
+ <inherited>false</inherited>
<configuration>
<jboss>
<version>4</version>
Modified: trunk/test-applications/regressionArea/Seam-ejb/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-22 12:43:48 UTC (rev 10525)
+++ trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-22 14:22:44 UTC (rev 10526)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.richfaces.test-applications</groupId>
<artifactId>regressionArea</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ejb</artifactId>
@@ -100,13 +100,6 @@
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.5</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
<version>beta3</version>
@@ -191,7 +184,7 @@
</plugins>
</build>
- <pluginRepositories>
+ <!--pluginRepositories>
<pluginRepository>
<id>exadel-repository</id>
<name>Exadel Maven Repository Manager</name>
@@ -202,5 +195,5 @@
<name>Exadel Maven Repository Manager</name>
<url>http://maven.eltegra.by:8099/repository</url>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories-->
</project>
Modified: trunk/test-applications/regressionArea/Seam-web/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-22 12:43:48 UTC (rev 10525)
+++ trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-22 14:22:44 UTC (rev 10526)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.richfaces.test-applications</groupId>
<artifactId>regressionArea</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-web</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ejb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -87,6 +87,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
+ <skip>true</skip>
<source>1.5</source>
<target>1.5</target>
</configuration>
@@ -105,10 +106,11 @@
</webResources>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
+ <inherited>false</inherited>
<configuration>
<skip>true</skip>
</configuration>
@@ -120,11 +122,14 @@
<profiles>
<profile>
<id>Test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<dependencies>
<dependency>
<groupId>org.richfaces.test-applications.regressionArea</groupId>
<artifactId>Seam-ear</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
Modified: trunk/test-applications/regressionArea/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/pom.xml 2008-09-22 12:43:48 UTC (rev 10525)
+++ trunk/test-applications/regressionArea/pom.xml 2008-09-22 14:22:44 UTC (rev 10526)
@@ -1,54 +1,50 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>samples</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
<groupId>org.richfaces.test-applications</groupId>
<artifactId>regressionArea</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
<name>Regresion Area:Seam Application</name>
- <repositories>
-
- <repository>
- <id>exadel-repository</id>
- <name>Exadel Maven Repository Manager</name>
- <url>http://maven.eltegra.by:8099/repository</url>
- </repository>
- <repository>
- <id>eltegra-maven-proxy</id>
- <name>Exadel Maven Repository Manager</name>
- <url>http://maven.eltegra.by:8099/repository</url>
-
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>maven-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
<properties>
<contextroot>Seam</contextroot>
<earname>Seam-ear-${version}</earname>
<richversion>3.2.2.GA</richversion>
- <seamversion>2.0.1.GA</seamversion>
+ <seamversion>2.0.2.SP1</seamversion>
<jsfversion>1.2_09</jsfversion>
<jbosshome>D:/Install/Java/jboss-4.2.3.GA</jbosshome>
<jbosscontext>default</jbosscontext>
</properties>
-<!--dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>${richversion}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${richversion}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${richversion}</version>
- </dependency>
- </dependencies-->
<modules>
<module>Seam-ejb</module>
@@ -79,7 +75,7 @@
</plugins>
</build>
-<pluginRepositories>
+<!--pluginRepositories>
<pluginRepository>
<id>people.apache.org</id>
<url>http://people.apache.org/repo/m2-snapshot-repository/</url>
@@ -88,6 +84,6 @@
<id>repository-int.exadel.com</id>
<url>http://repository-int.exadel.com/</url>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories-->
</project>
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r10525 - management/design/globalQueue.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-09-22 08:43:48 -0400 (Mon, 22 Sep 2008)
New Revision: 10525
Modified:
management/design/globalQueue/RS - globalQueue.doc
Log:
draft updated according to the discussion with Nick
Modified: management/design/globalQueue/RS - globalQueue.doc
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10524 - trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: pgolawski
Date: 2008-09-22 08:31:05 -0400 (Mon, 22 Sep 2008)
New Revision: 10524
Modified:
trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java
Log:
RF-4505, remember row key and restore it after walk
Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java 2008-09-22 10:43:43 UTC (rev 10523)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java 2008-09-22 12:31:05 UTC (rev 10524)
@@ -84,6 +84,7 @@
// final ScrollableDataTableRendererState state =
// ScrollableDataTableRendererState.createState(context, grid);
// state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid));
+ Object savedKey = table.getRowKey();
final TableHolder holder = new TableHolder(table);
@@ -134,9 +135,9 @@
selectionBinding.setValue(context.getELContext(),
simpleSelection);
}
+ table.setRowKey(savedKey);
+ // ScrollableDataTableRendererState.restoreState(context);
}
-
- // ScrollableDataTableRendererState.restoreState(context);
}
/*
@@ -244,6 +245,7 @@
// final ScrollableDataTableRendererState state =
// ScrollableDataTableRendererState.createState(context, grid);
// state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid));
+ Object savedKey = table.getRowKey();
final TableHolder holder = new TableHolder(table);
@@ -274,6 +276,7 @@
}, holder);
// ScrollableDataTableRendererState.restoreState(context);
+ table.setRowKey(savedKey);
table.getAttributes().put(CLIENT_SELECTION, clientSelection);
}
16 years, 3 months
JBoss Rich Faces SVN: r10523 - in management/design: globalQueue and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-09-22 06:43:43 -0400 (Mon, 22 Sep 2008)
New Revision: 10523
Added:
management/design/globalQueue/
management/design/globalQueue/RS - globalQueue.doc
management/design/globalQueue/Vision globalQueue.doc
Log:
Added: management/design/globalQueue/RS - globalQueue.doc
===================================================================
(Binary files differ)
Property changes on: management/design/globalQueue/RS - globalQueue.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/globalQueue/Vision globalQueue.doc
===================================================================
(Binary files differ)
Property changes on: management/design/globalQueue/Vision globalQueue.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 3 months
JBoss Rich Faces SVN: r10522 - in trunk/ui/extendedDataTable/src: main/java/org/richfaces/renderkit and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-09-22 05:21:07 -0400 (Mon, 22 Sep 2008)
New Revision: 10522
Modified:
trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/ExtendedDataTableState.java
trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
trunk/ui/extendedDataTable/src/test/java/org/richfaces/renderkit/AbstractExtendedTableRendererTest.java
Log:
RF-4505, allowing percentage column widths
Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/ExtendedDataTableState.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/ExtendedDataTableState.java 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/ExtendedDataTableState.java 2008-09-22 09:21:07 UTC (rev 10522)
@@ -269,7 +269,7 @@
private String getDefaultColumnSize(UIComponent column){
String widthStr = (String) column.getAttributes().get("width");
- return formatWidth((widthStr == null || widthStr.length() == 0) ? DEFAULT_WIDTH : widthStr);
+ return (widthStr == null) ? DEFAULT_WIDTH : widthStr;
}
public String getColumnSize(UIComponent column){
@@ -280,7 +280,7 @@
String colId = column.getId().toUpperCase();
for (String val : widths){
if (val.toUpperCase().startsWith(colId+"-")){
- return formatWidth(val.split("-")[1]);
+ return val.split("-")[1];
}
}//for
}
Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/AbstractExtendedTableRenderer.java 2008-09-22 09:21:07 UTC (rev 10522)
@@ -121,10 +121,6 @@
if (col.isRendered()) {
writer.startElement("col", table);
String colWidth = table.getColumnSize(col);
- if (Integer.valueOf(colWidth) < Integer
- .valueOf(MIN_COLUMN_WIDTH)) {
- colWidth = MIN_COLUMN_WIDTH;
- }
writer.writeAttribute("width", colWidth, null);
writer.endElement("col");
}
@@ -165,7 +161,7 @@
headerClass, null);
writer.endElement("th");
}
-
+ writer.endElement("tr");
if (header != null) {
writer.endElement("tr");
@@ -720,8 +716,7 @@
*/
protected void encodeRowId(FacesContext context, ResponseWriter writer,
UIDataTable table, int rowId) throws IOException {
- String[] ownersId = table.getClientId(context).split(":");
- String ownerId = ownersId[0] + ":" + ownersId[1];
+ String ownerId = table.getBaseClientId(context);
getUtils().writeAttribute(writer, "id", ownerId + ":n:" + rowId);
}
Modified: trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
--- trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-09-22 09:21:07 UTC (rev 10522)
@@ -175,7 +175,9 @@
},
OnWindowResize: function(event) {
- this.updateLayout();
+ if (this.table) {
+ this.updateLayout();
+ }
},
getColumnsNumber: function() {
return this.columnsNumber;
@@ -297,7 +299,7 @@
return sd.offsetWidth - sd.clientWidth;
},
validateColumnsWidth: function(columns,excessWidth) {
- var i=1;
+ var i=0;
var endIndex = columns.length-1;
while ((i < endIndex) && (excessWidth > 0)) {
if (ClientUILib.isIE) {
@@ -355,10 +357,19 @@
var footerHeight = this.getFooterHeight();
var columnsNumber = this.getColumnsNumber();
-
var visibleHeaderWidth = this.header.getVisibleWidth();
var scrollbarWidth = scrollingDiv.getElement().offsetWidth - scrollingDiv.getElement().clientWidth;
- var maxAllowedWidth = this.mainDiv.getWidth() - scrollbarWidth;
+ var maxAllowedWidth = mainDivWidth - scrollbarWidth;
+ for (var i=0; i < columnsNumber-1; i++) {
+ if (this.header.isColumnWidthPercentage(i)) {
+ //change percents into pixels
+ var val = this.header.getColumn(i).width;
+ val = (val.substr(0, val.length-1)*1)/100;
+ var width = maxAllowedWidth*val;
+ this.header.setColumnWidth(i, width);
+ this.setColumnWidth(i, width);
+ }
+ }
var excessWidth = this.header.getVisibleWidth() - maxAllowedWidth - 1;
if (excessWidth > 0) {
this.validateColumnsWidth(cols,excessWidth);
@@ -368,8 +379,7 @@
var newHeight = mainDivHeight - header.getHeight() - footerHeight - 2;
newHeight -= this.header.getCaptionHeight();
scrollingDiv.setStyle('height:'+ newHeight +'px;');
- var l = headerChildren.length;
- for (var i=0; i < l-1; i++) {
+ for (var i=0; i < columnsNumber-1; i++) {
var headerChild = headerChildren[i];
Utils.DOM.Event.removeListeners(headerChild);
Utils.DOM.Event.observe(headerChild,'mouseover',this.header.eventHeaderCellMouseOver);
Modified: trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
===================================================================
--- trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-09-22 09:21:07 UTC (rev 10522)
@@ -103,6 +103,13 @@
getColumns: function() {
return this.cols;
},
+ getColumn: function(index) {
+ if (this.isValidColumnNumber(index)) {
+ return this.cols[index];
+ }else{
+ return null;
+ }
+ },
getColumnCells: function() {
return this.columnCells;
},
@@ -121,8 +128,12 @@
}
},
+ isValidColumnNumber: function(columnNumber) {
+ return ((columnNumber < this.getColumnsNumber()) && (columnNumber >=0))
+ },
+
getColumnWidth: function(columnNumber) {
- if ((columnNumber < this.getColumnsNumber()) && (columnNumber >=0)) {
+ if (this.isValidColumnNumber(columnNumber)) {
var col = this.getColumnCells()[columnNumber];
if (col.offsetWidth != null) {
return col.offsetWidth;
@@ -135,6 +146,20 @@
}
},
+ isColumnWidthPercentage: function(columnNumber) {
+ if (this.isValidColumnNumber(columnNumber)) {
+ var col = this.getColumns()[columnNumber];
+ var width = col.width;
+ if ((!Object.isNumber(width)) && (width.indexOf('%') != -1)) {
+ return true;
+ }else{
+ return false;
+ }
+ }else{
+ return null;
+ }
+ },
+
getHeightWithoutFacets: function() {
return this.headerRow.getHeight() + this.filterRow.getHeight();
},
Modified: trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
===================================================================
--- trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2008-09-22 09:21:07 UTC (rev 10522)
@@ -284,7 +284,7 @@
if(!groupingExists) { //simple listener binding
if(this.options.selectionMode != "none") {
for(var i = 0; i < this.rowCount; i++) {
- var arr = nrows[i].id.split(this.prefix)[1].split(":");
+ var arr = nrows[i].id.split(":");
rowIndex = Number(arr[arr.length-1]);
this.addListener(nrows[i], rowIndex);
}
@@ -323,7 +323,7 @@
lastGroupId = groupId;
} else {
if(this.options.selectionMode != "none") {
- var arr = nrows[i].id.split(this.prefix)[1].split(":");
+ var arr = nrows[i].id.split(":");
rowIndex = Number(arr[arr.length-1]);
this.addListener(nrows[i], rowIndex);
}
@@ -413,7 +413,8 @@
var range, rowIndex;
var activeRow = this.activeRow;
var noDefault = false;
- this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);;
+ var arr = $(this.prefix + ":n").rows[0].id.split(":");
+ this.firstIndex = Number(arr[arr.length-1]);
switch (event.keyCode || event.charCode) {
case Event.KEY_UP:
if (this.inFocus && activeRow != null) {
@@ -506,7 +507,8 @@
var range;
if ( event.shiftKey && !event.ctrlKey && !bSingleSelection && !event.altKey) {
- this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);;
+ var arr = $(this.prefix + ":n").rows[0].id.split(":");
+ this.firstIndex = Number(arr[arr.length-1]);
this.selectionFlag = "x";
if(!this.shiftRow) {
this.shiftRow = this.activeRow;
Modified: trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx
===================================================================
--- trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-09-22 09:21:07 UTC (rev 10522)
@@ -62,12 +62,12 @@
<div
id="#{clientId}"
- class="extdt-maindiv"
- style="width:#{component.attributes['width']}; height:#{component.attributes['height']}"
+ class="extdt-maindiv rich-extdt-maindiv"
+ style="#{component.attributes['style']};width:#{component.attributes['width']};height:#{component.attributes['height']}"
>
<div id="#{clientId}:od" class="extdt-outerdiv"
- style="width:100%; height:100%;"
+ style="width:100%; height:100%;overflow: hidden;"
>
<div id="#{clientId}:dataTable_indicator" class="drgind_fly drgind_default drag_indicator" style="display: none;" >
<f:call name="encodeNamespace" />
@@ -98,10 +98,7 @@
<td colspan="#{columnsCount}" style="padding: 0px;">
<div id="#{clientId}:sd" class="extdt-content" style="height:50px;width:100%;">
<table id="#{clientId}:n" width="100%"
- class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
- style="#{component.attributes['style']}"
- cellpadding="0"
- cellspacing="0"
+ class="extdt-table-layout rich-table #{component.attributes['styleClass']}"
>
<f:call name="utils.encodePassThruWithExclusions">
<f:parameter value="height,value,name,type,id,class,rows,style,width" />
Modified: trunk/ui/extendedDataTable/src/test/java/org/richfaces/renderkit/AbstractExtendedTableRendererTest.java
===================================================================
--- trunk/ui/extendedDataTable/src/test/java/org/richfaces/renderkit/AbstractExtendedTableRendererTest.java 2008-09-20 17:57:11 UTC (rev 10521)
+++ trunk/ui/extendedDataTable/src/test/java/org/richfaces/renderkit/AbstractExtendedTableRendererTest.java 2008-09-22 09:21:07 UTC (rev 10522)
@@ -349,7 +349,7 @@
String className = element.getAttributeValue("id");
assertNotNull(className);
- assertEquals("extDT:10:n:0", className);
+ assertEquals("extDT:n:0", className);
}
}
16 years, 3 months
JBoss Rich Faces SVN: r10521 - trunk/framework/test/src/test/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-20 13:57:11 -0400 (Sat, 20 Sep 2008)
New Revision: 10521
Added:
trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeModelKeyConversionTest.java
Log:
https://jira.jboss.org/jira/browse/RF-2813
Added: trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeModelKeyConversionTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeModelKeyConversionTest.java (rev 0)
+++ trunk/framework/test/src/test/java/org/richfaces/model/StackingTreeModelKeyConversionTest.java 2008-09-20 17:57:11 UTC (rev 10521)
@@ -0,0 +1,180 @@
+/**
+ * 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.model;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.model.DataVisitor;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.richfaces.model.ListRowKey.CompositeKey;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.0
+ */
+
+public class StackingTreeModelKeyConversionTest extends AbstractAjax4JsfTestCase {
+
+ public StackingTreeModelKeyConversionTest(String name) {
+ super(name);
+ }
+
+ private StackingTreeModel model;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ final Map<Object, String> map = new HashMap<Object, String>();
+ map.put(Long.valueOf(17), "17");
+ map.put(new Object() {
+ @Override
+ public String toString() {
+ return "abc";
+ }
+ }, "abc");
+ map.put("9", "9");
+
+ model = new StackingTreeModel(null, "varx", null);
+
+ StackingTreeModel mapModel = new StackingTreeModel("mapsModel", "mapvar", new StackingTreeModelDataProvider() {
+ public Object getData() {
+ return new Map[] {
+ new HashMap(),
+ map,
+ new HashMap()
+ };
+ }
+ });
+
+ mapModel.addStackingModel(new StackingTreeModel("mapIteratorModel", "var", new StackingTreeModelDataProvider() {
+ public Object getData() {
+ return facesContext.getExternalContext().getRequestMap().get("mapvar");
+ }
+ }));
+
+ model.addStackingModel(mapModel);
+ model.addStackingModel(new StackingTreeModel(null, null, new StackingTreeModelDataProvider() {
+ public Object getData() {
+ return null;
+ }
+ }));
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+
+ model = null;
+ }
+
+ public void testConvertKey() throws Exception {
+ ListRowKey<CompositeKey> convertedKey = (ListRowKey<CompositeKey>) model.convertToKey(facesContext, "mapsModel:1:mapIteratorModel:17", null, null);
+ assertEquals(2, convertedKey.depth());
+
+ Iterator keySegments;
+
+ Iterator<CompositeKey> iterator = convertedKey.iterator();
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapsModel", keySegments.next());
+ assertEquals(Integer.valueOf(1), keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapIteratorModel", keySegments.next());
+ assertEquals(Long.valueOf(17), keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ assertFalse(iterator.hasNext());
+ }
+
+ public void testConvertKey1() throws Exception {
+ ListRowKey<CompositeKey> convertedKey = (ListRowKey<CompositeKey>) model.convertToKey(facesContext, "mapsModel:1:mapIteratorModel:9", null, null);
+ assertEquals(2, convertedKey.depth());
+
+ Iterator keySegments;
+
+ Iterator<CompositeKey> iterator = convertedKey.iterator();
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapsModel", keySegments.next());
+ assertEquals(Integer.valueOf(1), keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapIteratorModel", keySegments.next());
+ assertEquals("9", keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ assertFalse(iterator.hasNext());
+ }
+
+ public void testConvertKey2() throws Exception {
+ ListRowKey<CompositeKey> convertedKey = (ListRowKey<CompositeKey>) model.convertToKey(facesContext, "mapsModel:1:mapIteratorModel:abc", null, null);
+ assertEquals(2, convertedKey.depth());
+
+ Iterator keySegments;
+
+ Iterator<CompositeKey> iterator = convertedKey.iterator();
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapsModel", keySegments.next());
+ assertEquals(Integer.valueOf(1), keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapIteratorModel", keySegments.next());
+ assertEquals("abc", keySegments.next().toString());
+ assertFalse(keySegments.hasNext());
+
+ assertFalse(iterator.hasNext());
+ }
+
+ public void testConvertKey3() throws Exception {
+ ListRowKey<CompositeKey> convertedKey = (ListRowKey<CompositeKey>) model.convertToKey(facesContext, "mapsModel:0", null, null);
+ assertEquals(1, convertedKey.depth());
+
+ Iterator keySegments;
+
+ Iterator<CompositeKey> iterator = convertedKey.iterator();
+ keySegments = iterator.next().getKeySegments();
+
+ assertEquals("mapsModel", keySegments.next());
+ assertEquals(Integer.valueOf(0), keySegments.next());
+ assertFalse(keySegments.hasNext());
+
+ assertFalse(iterator.hasNext());
+ }
+
+}
16 years, 3 months
JBoss Rich Faces SVN: r10520 - in trunk: ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-20 12:52:23 -0400 (Sat, 20 Sep 2008)
New Revision: 10520
Modified:
trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
https://jira.jboss.org/jira/browse/RF-4011
Modified: trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2008-09-20 16:06:31 UTC (rev 10519)
+++ trunk/samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2008-09-20 16:52:23 UTC (rev 10520)
@@ -146,6 +146,7 @@
<a href="javascript:Richfaces.showModalPanel(':_panel');">Show</a>
<a href="javascript:Richfaces.showModalPanel(':_panel', {left: '120', top: 'auto'});">Show: left = 120; top = auto</a>
<a href="javascript:Richfaces.showModalPanel(':_panel', {top: 'auto', width: 800});">Show: width = 800; top = auto</a>
+ <a href="javascript:Richfaces.showModalPanel(':_panel', {width: 800, height: 600, minWidth: 700, minHeight: 500});">Show: minWidth = 700; minHeight = 500; width: 800; height: 600;</a>
<a href="javascript:Richfaces.showModalPanel(':_panel', {width: 1});">Show: width = 1</a>
<a href="javascript:Richfaces.showModalPanel('eventInfoID');">Show autosized panel</a>
<a href="javascript:Richfaces.showModalPanel('eventInfoID', {width: 1100, height: 700});">Show big autosized panel</a>
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-09-20 16:06:31 UTC (rev 10519)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-09-20 16:52:23 UTC (rev 10520)
@@ -80,6 +80,10 @@
return element;
}
+ModalPanel.getMinimumSize = function(size) {
+ return Math.max(size, 2*ModalPanel.Sizer.INITIAL_MIN + 2);
+};
+
ModalPanel.prototype = {
initialize: function(id, options) {
this["rich:destructor"] = "destroy";
@@ -92,8 +96,8 @@
this.baseZIndex = this.options.zindex ? this.options.zindex : 100;
- this.minWidth = Math.max(this.options.minWidth, 2*ModalPanel.Sizer.INITIAL_MIN + 2);
- this.minHeight = Math.max(this.options.minHeight, 2*ModalPanel.Sizer.INITIAL_MIN + 2);
+ this.minWidth = ModalPanel.getMinimumSize(this.options.minWidth);
+ this.minHeight = ModalPanel.getMinimumSize(this.options.minHeight);
this.div = id + "Div";
this.cursorDiv = id + "CursorDiv";
@@ -466,6 +470,10 @@
show: function(event, opts) {
if(!this.shown && this.invokeEvent("beforeshow",event,null,element)) {
+
+ this.currentMinHeight = ModalPanel.getMinimumSize((opts.minHeight || opts.minHeight == 0) ? opts.minHeight : this.minHeight);
+ this.currentMinWidth = ModalPanel.getMinimumSize((opts.minWidth || opts.minWidth == 0) ? opts.minWidth : this.minWidth);
+
var element = this.id;
this.preventFocus();
@@ -524,16 +532,16 @@
}
if (options.width && options.width != -1) {
- if (this.minWidth > options.width) {
- options.width = this.minWidth;
+ if (this.currentMinWidth > options.width) {
+ options.width = this.currentMinWidth;
}
eContentElt.style.width = options.width + (/px/.test(options.width) ? '' : 'px');
}
if (options.height && options.height != -1) {
- if (this.minHeight > options.height) {
- options.height = this.minHeight;
+ if (this.currentMinHeight > options.height) {
+ options.height = this.currentMinHeight;
}
eContentElt.style.height = options.height + (/px/.test(options.height) ? '' : 'px');
@@ -676,6 +684,10 @@
hide: function(event, opts) {
if (this.shown && this.invokeEvent("beforehide",event,null,element)) {
+
+ this.currentMinHeight = undefined;
+ this.currentMinWidth = undefined;
+
this.restoreFocus();
this.enableSelects();
@@ -757,15 +769,15 @@
var oldSize = newSize;
newSize += diff.deltaWidth || 0;
- if (newSize >= this.minWidth || this.options.autosized) {
+ if (newSize >= this.currentMinWidth || this.options.autosized) {
if (diff.deltaWidth) {
cssHashWH.width = newSize + 'px';
}
} else {
if (diff.deltaWidth) {
- cssHashWH.width = this.minWidth + 'px';
+ cssHashWH.width = this.currentMinWidth + 'px';
- vetoes.vx = oldSize - this.minWidth;
+ vetoes.vx = oldSize - this.currentMinWidth;
}
vetoes.x = true;
@@ -793,15 +805,15 @@
var oldSize = newSize;
newSize += diff.deltaHeight || 0;
- if (newSize >= this.minHeight || this.options.autosized) {
+ if (newSize >= this.currentMinHeight || this.options.autosized) {
if (diff.deltaHeight) {
cssHashWH.height = newSize + 'px';
}
} else {
if (diff.deltaHeight) {
- cssHashWH.height = this.minHeight + 'px';
+ cssHashWH.height = this.currentMinHeight + 'px';
- vetoes.vy = oldSize - this.minHeight;
+ vetoes.vy = oldSize - this.currentMinHeight;
}
vetoes.y = true;
16 years, 3 months