12:33 p.m.
Author: nbelaevski
Date: 2007-08-01 13:33:17 -0400 (Wed, 01 Aug 2007)
New Revision: 1990
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
trunk/samples/calendar-sample/pom.xml
trunk/samples/pom.xml
trunk/samples/treeModelDemo/pom.xml
trunk/sandbox/samples/pom.xml
trunk/sandbox/ui/pom.xml
trunk/ui/calendar/pom.xml
trunk/ui/pom.xml
trunk/ui/treeModel/pom.xml
Log:
Calendar & TreeModel moved from sandbox to head
StackingTreeModel.java updated to return rowData
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
===================================================================
---
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-08-01
17:24:40 UTC (rev 1989)
+++
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-08-01
17:33:17 UTC (rev 1990)
@@ -396,11 +396,12 @@
* @see javax.faces.model.DataModel#getRowData()
*/
public Object getRowData() {
-// if (stackingTreeModel != null && stackingTreeModel != this) {
-// return stackingTreeModel.getRowData();
-// }
+ if (stackEntries.isEmpty()) {
+ return null;
+ }
- return this.rowData;
+ StackEntry lastEntry = (StackEntry) stackEntries.getLast();
+ return lastEntry.model.rowData;
}
/*
Modified: trunk/samples/calendar-sample/pom.xml
===================================================================
--- trunk/samples/calendar-sample/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/samples/calendar-sample/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -1,7 +1,7 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
<name>calendar-sample Maven Webapp</name>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>calendar</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/samples/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -436,6 +436,8 @@
<module>richfaces-demo</module>
<module>dropdownmenu-sample</module>
<module>tooltip-sample</module>
+ <module>calendar-sample</module>
+ <module>treeModelDemo</module>
<!--
<module>ajaxPortlet</module>
-->
Modified: trunk/samples/treeModelDemo/pom.xml
===================================================================
--- trunk/samples/treeModelDemo/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/samples/treeModelDemo/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -1,7 +1,7 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
<name>Tree Model Maven Webapp</name>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>treeModel</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
Modified: trunk/sandbox/samples/pom.xml
===================================================================
--- trunk/sandbox/samples/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/sandbox/samples/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -13,11 +13,9 @@
<name>RichFaces Sandbox Components Examples</name>
<modules>
- <module>calendar-sample</module>
<module>scrollable-grid-demo</module>
<module>panel2-sample</module>
<module>simpleTogglePanel2-sample</module>
<module>rich-message-demo </module>
- <module>treeModelDemo</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/sandbox/ui/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -12,11 +12,9 @@
<artifactId>ui</artifactId>
<name>Richfaces Sandbox UI</name>
<modules>
- <module>calendar</module>
<module>panel2</module>
<module>scrollable-grid</module>
<module>simpleTogglePanel2</module>
<module>message</module>
- <module>treeModel</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/ui/calendar/pom.xml
===================================================================
--- trunk/ui/calendar/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/ui/calendar/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -2,11 +2,11 @@
<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">
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>calendar</artifactId>
<name>Calendar</name>
<build>
Modified: trunk/ui/pom.xml
===================================================================
--- trunk/ui/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/ui/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -81,6 +81,8 @@
<module>dropdown-menu</module>
<module>tooltip</module>
<module>panelmenu</module>
+ <module>calendar</module>
+ <module>treeModel</module>
</modules>
<dependencies>
<dependency>
Modified: trunk/ui/treeModel/pom.xml
===================================================================
--- trunk/ui/treeModel/pom.xml 2007-08-01 17:24:40 UTC (rev 1989)
+++ trunk/ui/treeModel/pom.xml 2007-08-01 17:33:17 UTC (rev 1990)
@@ -2,11 +2,11 @@
<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">
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>treeModel</artifactId>
<name>Tree Model</name>
<build>