Author: nbelaevski Date: 2008-08-10 09:02:22 -0400 (Sun, 10 Aug 2008) New Revision: 10003 Added: trunk/ui/extendedDataTable/ Removed: trunk/ui/extendedDataTable/src/main/templates/org/richfaces/sandbox/ Modified: trunk/ui/extendedDataTable/pom.xml trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/RichTableMenuRenderer.java trunk/ui/pom.xml Log: Extended data table moved to main build Copied: trunk/ui/extendedDataTable (from rev 10001, trunk/sandbox/ui/extendedDataTable) Modified: trunk/ui/extendedDataTable/pom.xml =================================================================== --- trunk/sandbox/ui/extendedDataTable/pom.xml 2008-08-08 19:50:34 UTC (rev 10001) +++ trunk/ui/extendedDataTable/pom.xml 2008-08-10 13:02:22 UTC (rev 10003) @@ -1,11 +1,11 @@ <?xml version="1.0"?><project> <parent> <artifactId>ui</artifactId> - <groupId>org.richfaces.sandbox</groupId> + <groupId>org.richfaces</groupId> <version>3.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>extendedDataTable</artifactId> <name>extendedDataTable</name> <build> @@ -24,7 +24,7 @@ </executions> <configuration> <library> - <prefix>org.richfaces.sandbox</prefix> + <prefix>org.richfaces</prefix> <taglib> <shortName>extendedDataTable</shortName> </taglib> @@ -68,13 +68,41 @@ </dependency> <dependency> <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> + <artifactId>drag-drop</artifactId> <version>3.2.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <version>3.2.2-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.richfaces.sandbox</groupId> - <artifactId>richfaces-sandbox-impl</artifactId> - <version>3.2.2-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <version>3.2.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>contextMenu</artifactId> + <version>3.2.2-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>jquery</artifactId> + <version>3.2.2-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>componentControl</artifactId> + <version>3.2.2-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>scrollableDataTable</artifactId> + <version>3.2.2-SNAPSHOT</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/RichTableMenuRenderer.java =================================================================== --- trunk/sandbox/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/RichTableMenuRenderer.java 2008-08-08 19:50:34 UTC (rev 10001) +++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/RichTableMenuRenderer.java 2008-08-10 13:02:22 UTC (rev 10003) @@ -20,7 +20,7 @@ import org.richfaces.component.html.ContextMenu; import org.richfaces.component.html.HtmlMenuGroup; import org.richfaces.component.html.HtmlMenuItem; -import org.richfaces.component.util.SandboxMessageUtil; +import org.richfaces.component.util.ComponentMessageUtil; /** * Renderer class for table menu. @@ -149,7 +149,7 @@ // add menu items for changing column visibility UIMenuGroup group = (HtmlMenuGroup) context.getApplication() .createComponent(UIMenuGroup.COMPONENT_TYPE); - group.setValue(SandboxMessageUtil.getMessage(context, MSG_COLUMNS, + group.setValue(ComponentMessageUtil.getMessage(context, MSG_COLUMNS, new Object[] {}).getSummary()); group.setIcon(iconColumnsURI); menu.getChildren().add(group); @@ -203,7 +203,7 @@ } else { menuItem.setDisabled(true); } - menuItem.setValue(SandboxMessageUtil.getMessage(context, + menuItem.setValue(ComponentMessageUtil.getMessage(context, (asc ? MSG_SORT_ASC : MSG_SORT_DESC), new Object[] {}) .getSummary()); menuItem.setIcon((asc ? iconSortAscURI : iconSortDescURI)); @@ -257,7 +257,7 @@ menuItem.setDisabled(true); } - menuItem.setValue(SandboxMessageUtil.getMessage(context, + menuItem.setValue(ComponentMessageUtil.getMessage(context, (isGroupingColumn ? MSG_GROUP_OFF : MSG_GROUP_ON), new Object[] {}).getSummary()); menuItem.setIcon(iconGroupURI); Modified: trunk/ui/pom.xml =================================================================== --- trunk/ui/pom.xml 2008-08-10 13:01:09 UTC (rev 10002) +++ trunk/ui/pom.xml 2008-08-10 13:02:22 UTC (rev 10003) @@ -129,6 +129,7 @@ <module>hotKey</module> <module>beanValidator</module> <module>state</module> + <module>extendedDataTable</module> </modules> <dependencies> <dependency>