Author: nbelaevski Date: 2007-07-13 13:44:11 -0400 (Fri, 13 Jul 2007) New Revision: 1623 Added: trunk/framework/api-parent/ trunk/framework/api-parent/pom.xml trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/ISimpleToggle2Listener.java trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/SimpleToggle2Event.java Modified: trunk/framework/api/pom.xml trunk/framework/pom.xml trunk/sandbox/api/pom.xml trunk/sandbox/samples/pom.xml trunk/sandbox/samples/tooltip-sample/pom.xml trunk/sandbox/ui/pom.xml trunk/sandbox/ui/tooltip/pom.xml trunk/sandbox/ui/tooltip/src/main/config/component/toolTip.xml trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/image/AbstractToolTipCornerImage.java Log: Latest sandbox updates Modified: trunk/framework/api/pom.xml =================================================================== --- trunk/framework/api/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/framework/api/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -1,68 +1,14 @@ -<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>framework</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.framework</groupId> - <artifactId>api</artifactId> - <name>Java Server Faces AJAX framework API</name> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</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>api-parent</artifactId> + <groupId>org.richfaces.framework</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../api-parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <artifactId>api</artifactId> + <name>Java Server Faces AJAX framework API</name> </project> \ No newline at end of file Added: trunk/framework/api-parent/pom.xml =================================================================== --- trunk/framework/api-parent/pom.xml (rev 0) +++ trunk/framework/api-parent/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -0,0 +1,69 @@ +<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>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.framework</groupId> + <packaging>pom</packaging> + <artifactId>api-parent</artifactId> + <name>Java Server Faces AJAX framework API Dependencies</name> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/framework/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -1,21 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>root</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>framework</artifactId> - <packaging>pom</packaging> - <name>Java Server Faces AJAX framework</name> - <dependencies /> - <build> - </build> - <modules> - <module>api</module> - <module>impl</module> - <module>test</module> - </modules> +<?xml version="1.0" encoding="UTF-8"?> +<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>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> + <packaging>pom</packaging> + <name>Java Server Faces AJAX framework</name> + <dependencies /> + <build> + </build> + <modules> + <module>api-parent</module> + <module>api</module> + <module>impl</module> + <module>test</module> + </modules> </project> \ No newline at end of file Modified: trunk/sandbox/api/pom.xml =================================================================== --- trunk/sandbox/api/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/api/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -2,71 +2,22 @@ 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>sandbox</artifactId> - <groupId>org.richfaces</groupId> + <artifactId>api-parent</artifactId> + <groupId>org.richfaces.framework</groupId> <version>3.1.0-SNAPSHOT</version> + <relativePath>../../framework/api-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox</groupId> <artifactId>api</artifactId> - <name>Richfaces Sandbox API</name> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> + <name>Richfaces Sandbox API</name> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>api</artifactId> <version>${project.version}</version> </dependency> - </dependencies></project> \ No newline at end of file + </dependencies> + + +</project> \ No newline at end of file Modified: trunk/sandbox/samples/pom.xml =================================================================== --- trunk/sandbox/samples/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/samples/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -19,6 +19,6 @@ <module>simpleTogglePanel2-sample</module> <module>panelmenu-sample</module> - <!--module>tooltip-sample</module--> + <module>tooltip-sample</module> </modules> </project> \ No newline at end of file Modified: trunk/sandbox/samples/tooltip-sample/pom.xml =================================================================== --- trunk/sandbox/samples/tooltip-sample/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/samples/tooltip-sample/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -1,7 +1,7 @@ <?xml version="1.0"?><project> <parent> - <artifactId>richfaces-samples</artifactId> - <groupId>org.richfaces</groupId> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -11,12 +11,7 @@ <name>tooltip-sample Maven Webapp</name> <dependencies> <dependency> - <groupId>org.richfaces</groupId> - <artifactId>common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>tooltip</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/sandbox/ui/pom.xml =================================================================== --- trunk/sandbox/ui/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/ui/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -15,6 +15,7 @@ <module>calendar</module> <module>panelmenu</module> <module>panel2</module> + <module>tooltip</module> <!--module>scrollable-grid</module--> <module>simpleTogglePanel2</module> </modules> Added: trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/ISimpleToggle2Listener.java =================================================================== --- trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/ISimpleToggle2Listener.java (rev 0) +++ trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/ISimpleToggle2Listener.java 2007-07-13 17:44:11 UTC (rev 1623) @@ -0,0 +1,38 @@ +/** + * 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 + */ + +/* + * Created on 11.07.2006 + */ +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * @author igels + */ + +//TODO by nick - denis - add addToggleListener method to component +public interface ISimpleToggle2Listener extends FacesListener { + + public void processToggle(SimpleToggle2Event event); + +} \ No newline at end of file Added: trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/SimpleToggle2Event.java =================================================================== --- trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/SimpleToggle2Event.java (rev 0) +++ trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/event/SimpleToggle2Event.java 2007-07-13 17:44:11 UTC (rev 1623) @@ -0,0 +1,76 @@ +/** + * 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 + */ + +/* + * Created on 11.07.2006 + */ +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.ActionEvent; +import javax.faces.event.FacesListener; + +/** + * @author igels + */ +public class SimpleToggle2Event extends ActionEvent { + + private static final long serialVersionUID = 5582624805941635421L; + private boolean _opened; + + /** + * @param source + * @param opened + */ + public SimpleToggle2Event(UIComponent source, boolean opened) { + super(source); + this._opened = opened; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener listener) { + return listener instanceof ISimpleToggle2Listener; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener listener) { + ((ISimpleToggle2Listener) listener).processToggle(this); + } + + /** + * @return Returns the _state. + */ + public boolean isIsOpen() { + return _opened; + } + + /** + * + * @param opened The state to set + */ + public void setIsOpen(boolean opened) { + this._opened = opened; + } +} \ No newline at end of file Modified: trunk/sandbox/ui/tooltip/pom.xml =================================================================== --- trunk/sandbox/ui/tooltip/pom.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/ui/tooltip/pom.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -1,11 +1,11 @@ <?xml version="1.0"?><project> <parent> <artifactId>ui</artifactId> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.sandbox</groupId> <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> + <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>tooltip</artifactId> <name>tooltip</name> <build> @@ -13,7 +13,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -35,9 +35,9 @@ </build> <dependencies> <dependency> - <groupId>org.richfaces</groupId> - <artifactId>common</artifactId> - <version>3.1.0-SNAPSHOT</version> + <groupId>org.richfaces.framework</groupId> + <artifactId>impl</artifactId> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/sandbox/ui/tooltip/src/main/config/component/toolTip.xml =================================================================== --- trunk/sandbox/ui/tooltip/src/main/config/component/toolTip.xml 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/ui/tooltip/src/main/config/component/toolTip.xml 2007-07-13 17:44:11 UTC (rev 1623) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > <components> <component> @@ -14,7 +14,7 @@ <tag> <name>toolTip</name> <classname>org.richfaces.taglib.ToolTipTag</classname> - <superclass>org.ajax4jsf.framework.taglib.HtmlComponentTagBase</superclass> + <superclass>org.ajax4jsf.webapp.taglib.HtmlComponentTagBase</superclass> </tag> Modified: trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java =================================================================== --- trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-13 17:44:11 UTC (rev 1623) @@ -7,7 +7,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.renderkit.AjaxComponentRendererBase; -import org.ajax4jsf.framework.skin.Skin; +import org.richfaces.skin.Skin; import org.richfaces.component.UIToolTip; import org.richfaces.renderkit.html.image.cornerimages.BottomLeftToolTipCornerImage; import org.richfaces.renderkit.html.image.cornerimages.BottomRightToolTipCornerImage; Modified: trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/image/AbstractToolTipCornerImage.java =================================================================== --- trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/image/AbstractToolTipCornerImage.java 2007-07-13 16:42:27 UTC (rev 1622) +++ trunk/sandbox/ui/tooltip/src/main/java/org/richfaces/renderkit/html/image/AbstractToolTipCornerImage.java 2007-07-13 17:44:11 UTC (rev 1623) @@ -18,15 +18,15 @@ import javax.faces.context.FacesContext; import javax.imageio.ImageIO; -import org.ajax4jsf.framework.resource.GifRenderer; -import org.ajax4jsf.framework.resource.InternetResourceBuilder; -import org.ajax4jsf.framework.resource.Java2Dresource; -import org.ajax4jsf.framework.resource.JpegRenderer; -import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.HtmlColor; -import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.resource.GifRenderer; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.JpegRenderer; +import org.ajax4jsf.resource.ResourceContext; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.HtmlDimensions; public abstract class AbstractToolTipCornerImage extends Java2Dresource{