Author: nbelaevski Date: 2007-07-02 10:59:35 -0400 (Mon, 02 Jul 2007) New Revision: 1433 Added: branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java Modified: branches/refactor1/ui/core/ branches/refactor1/ui/dataFilterSlider/pom.xml branches/refactor1/ui/dataTable/pom.xml branches/refactor1/ui/datascroller/pom.xml branches/refactor1/ui/drag-drop/pom.xml branches/refactor1/ui/dropdown-menu/pom.xml branches/refactor1/ui/menu-components/pom.xml branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx branches/refactor1/ui/paint2D/pom.xml branches/refactor1/ui/panel/pom.xml branches/refactor1/ui/simpleTogglePanel/pom.xml branches/refactor1/ui/spacer/pom.xml branches/refactor1/ui/suggestionbox/pom.xml branches/refactor1/ui/tabPanel/pom.xml branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java branches/refactor1/ui/togglePanel/pom.xml branches/refactor1/ui/toolBar/pom.xml Log: richfaces.ui made compilable Property changes on: branches/refactor1/ui/core ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Modified: branches/refactor1/ui/dataFilterSlider/pom.xml =================================================================== --- branches/refactor1/ui/dataFilterSlider/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dataFilterSlider/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,69 +1,51 @@ -<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</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataFilterSlider</artifactId> - <name>Data Filter Slider</name> - <build> - <plugins> - - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dataFilterSlider</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <releases /> - <snapshots /> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>https://maven2-repository.dev.java.net/nonav/repository</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <releases /> - <snapshots /> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>https://maven2-repository.dev.java.net/nonav/repository</url> - </pluginRepository> - </pluginRepositories> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.parent.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataFilterSlider</artifactId> + <name>Data Filter Slider</name> + <build> + <plugins> + + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dataFilterSlider</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/dataTable/pom.xml =================================================================== --- branches/refactor1/ui/dataTable/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dataTable/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,59 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dataTable</artifactId> - <name>Extended data table and lists</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dataTable</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - - <pluginRepositories> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven2-snapshots.ajax4jsf.org</id> - <name>Ajax4jsf Repository for Maven Snapshots</name> - <url>https://ajax4jsf.dev.java.net/nonav/snapshots</url> - </pluginRepository> - </pluginRepositories> - <dependencies> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <name>Extended data table and lists</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dataTable</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/datascroller/pom.xml =================================================================== --- branches/refactor1/ui/datascroller/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/datascroller/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>datascroller</artifactId> - <name>Data Scroller</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>datascroller</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>datascroller</artifactId> + <name>Data Scroller</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>datascroller</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/drag-drop/pom.xml =================================================================== --- branches/refactor1/ui/drag-drop/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/drag-drop/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +1,55 @@ -<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</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>drag-drop</artifactId> - <name>Drag and Drop</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dnd</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>drag-drop</artifactId> + <name>Drag and Drop</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dnd</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/dropdown-menu/pom.xml =================================================================== --- branches/refactor1/ui/dropdown-menu/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/dropdown-menu/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,55 +1,55 @@ -<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</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>dropdown-menu</artifactId> - <name>Drop down menu</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>dropdown-menu</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>dropdown-menu</artifactId> + <name>Drop down menu</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>dropdown-menu</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/menu-components/pom.xml =================================================================== --- branches/refactor1/ui/menu-components/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>menu-components</artifactId> - <name>Menu components</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>menu-components</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>menu-components</artifactId> + <name>Menu components</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>menu-components</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java =================================================================== --- branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -29,7 +29,6 @@ import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.util.command.CommandScriptBuilder; import org.richfaces.component.MenuComponent; import org.richfaces.component.UIMenuGroup; import org.richfaces.component.UIMenuItem; Modified: branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -24,7 +24,6 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; -import org.ajax4jsf.framework.util.command.CommandScriptBuilder; import org.richfaces.component.MenuComponent; import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; @@ -110,17 +109,26 @@ scriptValue.append(AjaxRendererUtils.buildOnClick( menuItem, context).toString()); } else if (mode.equalsIgnoreCase(MenuComponent.MODE_SERVER)) { - CommandScriptBuilder builder = new CommandScriptBuilder(menuItem); - builder.setCheckActionAndListener(false); - Object target = menuItem.getAttributes().get("target"); - if (null != target) { - builder.setTarget((String) target); - } - builder.setUseOriginalOnclick(true); - builder.addCodeBefore("Event.stop(event || window.event);"); - String id = menuItem.getClientId(context); - builder.addParameter(id + ":hidden", id); - scriptValue.append(builder.toString()); + String id = menuItem.getClientId(context); + scriptValue.append('{'); + scriptValue.append("var form = A4J.findForm(this);"); + scriptValue.append("var params = new Object();"); + scriptValue.append("params['"); + scriptValue.append(id + ":hidden"); + scriptValue.append("'] = "); + scriptValue.append(id); + scriptValue.append(';'); + scriptValue.append("Richfaces.jsFormSubmit('"); + scriptValue.append(id); + scriptValue.append("', "); + scriptValue.append("form.id, "); + Object target = menuItem.getAttributes().get("target"); + if (null != target) { + scriptValue.append("'"+(String) target+"', "); + } else { + scriptValue.append("'', "); + } + scriptValue.append("params);}; return false;"); } else { scriptValue.append( getStringAttributeOrEmptyString(menuItem, "onclick")); Modified: branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-02 14:59:35 UTC (rev 1433) @@ -14,7 +14,8 @@ <h:scripts> new org.ajax4jsf.framework.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), - new org.ajax4jsf.framework.util.command.CommandScript() + /org/richfaces/renderkit/html/scripts/utils.js, + /org/ajax4jsf/renderkit/html/scripts/form.js </h:scripts> <f:call name="initializeResources" /> Modified: branches/refactor1/ui/paint2D/pom.xml =================================================================== --- branches/refactor1/ui/paint2D/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/paint2D/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,58 +1,51 @@ -<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</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>paint2D</artifactId> - <name>Paint java 2D</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>paint2D</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>paint2D</artifactId> + <name>Paint java 2D</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>paint2D</shortName> + </taglib> + </library> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: branches/refactor1/ui/panel/pom.xml =================================================================== --- branches/refactor1/ui/panel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/panel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,51 +1,51 @@ -<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</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>panel</artifactId> - <name>Panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>panel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>panel</artifactId> + <name>Panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>panel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/simpleTogglePanel/pom.xml =================================================================== --- branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/simpleTogglePanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>simpleTogglePanel</artifactId> - <name>Toggle panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>simpleTogglePanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>simpleTogglePanel</artifactId> + <name>Toggle panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>simpleTogglePanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/spacer/pom.xml =================================================================== --- branches/refactor1/ui/spacer/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/spacer/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>spacer</artifactId> - <name>Spacer</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>spacer</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>spacer</artifactId> + <name>Spacer</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>spacer</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/suggestionbox/pom.xml =================================================================== --- branches/refactor1/ui/suggestionbox/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/suggestionbox/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>suggestionbox</artifactId> - <name>Suggestion box</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>suggestionbox</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>suggestionbox</artifactId> + <name>Suggestion box</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>suggestionbox</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/tabPanel/pom.xml =================================================================== --- branches/refactor1/ui/tabPanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/tabPanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>tabPanel</artifactId> - <name>Tab panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>tabPanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>tabPanel</artifactId> + <name>Tab panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>tabPanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java =================================================================== --- branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -25,7 +25,6 @@ import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxSource; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; -import org.richfaces.model.TabModel; import javax.faces.FacesException; import javax.faces.component.ActionSource; @@ -42,7 +41,7 @@ * @version $Revision: 1.12 $ $Date: 2007/02/21 20:35:05 $ */ //TODO remove excess interfaces -public abstract class UITab extends AjaxActionComponent implements TabModel, AjaxComponent, AjaxSource, ActionSource { +public abstract class UITab extends AjaxActionComponent implements AjaxComponent, AjaxSource, ActionSource { public static final String COMPONENT_TYPE = "org.richfaces.Tab"; Modified: branches/refactor1/ui/togglePanel/pom.xml =================================================================== --- branches/refactor1/ui/togglePanel/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/togglePanel/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>togglePanel</artifactId> - <name>Toggle panel</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>togglePanel</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>togglePanel</artifactId> + <name>Toggle panel</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>togglePanel</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/refactor1/ui/toolBar/pom.xml =================================================================== --- branches/refactor1/ui/toolBar/pom.xml 2007-07-02 14:13:05 UTC (rev 1432) +++ branches/refactor1/ui/toolBar/pom.xml 2007-07-02 14:59:35 UTC (rev 1433) @@ -1,50 +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"> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> - <artifactId>toolBar</artifactId> - <name>Tool bar</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>toolBar</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.ui</groupId> + <artifactId>toolBar</artifactId> + <name>Tool bar</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.1.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>toolBar</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Added: branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java =================================================================== --- branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java (rev 0) +++ branches/refactor1/ui/tree/src/main/java/org/richfaces/component/CacheableTreeDataModel.java 2007-07-02 14:59:35 UTC (rev 1433) @@ -0,0 +1,140 @@ +/** + * License Agreement. + * + * JBoss RichFaces 3.0 - 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.component; + +import java.io.IOException; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.ajax.repeat.DataVisitor; +import org.ajax4jsf.ajax.repeat.Range; + +/** + * @author Nick - mailto:nbelaevski@exadel.com created 08.01.2007 + * + */ +public class CacheableTreeDataModel extends TreeDataModel { + + private final class Visitor implements DataVisitor, LastElementAware { + private final DataVisitor visitor; + + private Visitor(DataVisitor visitor) { + this.visitor = visitor; + } + + public void process(FacesContext context, Object rowKey, Object argument) + throws IOException { + TreeRowKey treeRowKey = (TreeRowKey) rowKey; + treeDataModel.setRowKey(treeRowKey); + locateTreeNode(treeRowKey, true).setData(treeDataModel.getRowData()); + + if (visitor != null) { + visitor.process(context, rowKey, argument); + } + } + + public void resetLastElement() { + if (visitor instanceof LastElementAware) { + ((LastElementAware) visitor).resetLastElement(); + + } + } + + public void setLastElement() { + if (visitor instanceof LastElementAware) { + ((LastElementAware) visitor).setLastElement(); + + } + } + } + + private TreeDataModel treeDataModel; + + public boolean isLeaf() { + TreeRowKey rowKey = (TreeRowKey) getRowKey(); + TreeNode treeNode = locateTreeNode(rowKey); + if (treeNode != null && !treeNode.isLeaf()) { + return false; + } + + treeNode = treeDataModel.locateTreeNode(rowKey); + if (treeNode != null) { + return treeNode.isLeaf(); + } + + return false; + } + + public CacheableTreeDataModel(TreeDataModel model) { + super(); + setWrappedData(new TreeNodeImpl()); + setTreeDataModel(model); + } + + public void walkModel(FacesContext context, DataVisitor visitor, + Range range, Object key, Object argument, boolean last) + throws IOException { + treeDataModel.walkModel(context, new Visitor(visitor), range, key, + argument, last); + } + + public void setTreeDataModel(TreeDataModel treeDataModel) { + this.treeDataModel = treeDataModel; + } + + public TreeDataModel getTreeDataModel() { + return treeDataModel; + } + + public void walk(FacesContext context, final DataVisitor dataVisitor, + Range range, Object rowKey, Object argument, boolean last) + throws IOException { + + TreeNode cachedTreeNode = locateTreeNode((TreeRowKey) rowKey); + TreeNode treeNode = treeDataModel.locateTreeNode((TreeRowKey) rowKey); + + if (treeNode != null) { + if (cachedTreeNode == null || (cachedTreeNode.isLeaf() && !treeNode.isLeaf())) { + //fill cache + treeDataModel.walk(context, new Visitor(dataVisitor), range, + rowKey, argument, last); + } else { + super.walk(context, dataVisitor, range, rowKey, argument, last); + } + } + } + + public void setRowData(Object object) { + (locateTreeNode((TreeRowKey)getRowKey())).setData(object); + } + + public boolean isTransient() { + return true; + } + + public void setTransient(boolean newTransientValue) { + if (!newTransientValue) { + throw new IllegalArgumentException( + "ReplaceableTreeDataModel shouldn't be transient!"); + } + } +}