JBoss Rich Faces SVN: r18773 - in trunk: core/impl/src/test/java/org/richfaces/component/util and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-18 13:24:07 -0400 (Wed, 18 Aug 2010)
New Revision: 18773
Added:
trunk/ui/common/api/src/main/java/org/richfaces/component/SwitchType.java
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java
trunk/ui/common/ui/src/test/java/org/
trunk/ui/common/ui/src/test/java/org/richfaces/
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java
Removed:
trunk/core/impl/src/main/java/org/richfaces/component/util/FormUtil.java
trunk/core/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java
trunk/ui/output/api/src/main/java/org/richfaces/component/SwitchType.java
Log:
RF-9010 TogglePanel improve diagnostic of "form not found" case
Deleted: trunk/core/impl/src/main/java/org/richfaces/component/util/FormUtil.java
===================================================================
--- trunk/core/impl/src/main/java/org/richfaces/component/util/FormUtil.java 2010-08-18 17:16:46 UTC (rev 18772)
+++ trunk/core/impl/src/main/java/org/richfaces/component/util/FormUtil.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -1,53 +0,0 @@
-/**
- * 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.component.util;
-
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.richfaces.component.EnclosingFormRequiredException;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
-import javax.faces.context.FacesContext;
-
-/**
- * @author Filip Antonov - mailto:fantonov@exadel.com
- * created 08.02.2007
- */
-public final class FormUtil {
- private FormUtil() {
- }
-
- public static void throwEnclFormReqExceptionIfNeed(FacesContext context, UIComponent component)
- throws EnclosingFormRequiredException {
-
- UIForm form = RendererUtils.getInstance().getNestingForm(context, component);
-
- // TODO nick -> nick - switchType checking can be harmful here
- String switchType = (String) component.getAttributes().get("switchType");
- boolean isSwitchTypeClient = (switchType == null) ? false : switchType.equalsIgnoreCase("client");
-
- if ((form == null) && !isSwitchTypeClient) {
- throw new EnclosingFormRequiredException(component.getClass().toString() + " (id=\"" + component.getId()
- + "\") did not find parent form.");
- }
- }
-}
Deleted: trunk/core/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java
===================================================================
--- trunk/core/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java 2010-08-18 17:16:46 UTC (rev 18772)
+++ trunk/core/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -1,83 +0,0 @@
-/**
- * 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.component.util;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UIViewRoot;
-
-import org.jboss.test.faces.AbstractFacesTest;
-import org.richfaces.component.EnclosingFormRequiredException;
-
-/**
- * @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 11.04.2007
- *
- */
-public class FormUtilTest extends AbstractFacesTest {
- @Override
- public void setUp() throws Exception {
- super.setUp();
- setupFacesRequest();
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testThrowEnclFormReqExceptionIfNeed() throws Exception {
- UIViewRoot viewRoot = facesContext.getViewRoot();
- UIComponent form = application.createComponent(UIForm.COMPONENT_TYPE);
-
- viewRoot.getChildren().add(form);
-
- UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
-
- form.getChildren().add(testComponent);
- FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
- }
-
- public void testThrowEnclFormReqExceptionIfNeedNoForm() throws Exception {
- UIViewRoot viewRoot = facesContext.getViewRoot();
- UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
-
- viewRoot.getChildren().add(testComponent);
-
- try {
- FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
- fail();
- } catch (EnclosingFormRequiredException e) {}
- }
-
- public void testThrowEnclFormReqExceptionIfNeedClient() throws Exception {
- UIViewRoot viewRoot = facesContext.getViewRoot();
- UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
-
- testComponent.getAttributes().put("switchType", "CLIENT");
- viewRoot.getChildren().add(testComponent);
- FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
- }
-}
Copied: trunk/ui/common/api/src/main/java/org/richfaces/component/SwitchType.java (from rev 18768, trunk/ui/output/api/src/main/java/org/richfaces/component/SwitchType.java)
===================================================================
--- trunk/ui/common/api/src/main/java/org/richfaces/component/SwitchType.java (rev 0)
+++ trunk/ui/common/api/src/main/java/org/richfaces/component/SwitchType.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -0,0 +1,24 @@
+package org.richfaces.component;
+
+/**
+ * @author akolonitsky
+ * @since Jun 15, 2010
+ */
+public enum SwitchType {
+ /**
+ * value for tab change method for - client-side tabs.
+ */
+ client,
+
+ /**
+ * value for tab change method - server-side tabs
+ */
+ server,
+
+ /**
+ * value for tab change method - ajax tabs
+ */
+ ajax;
+
+ public static final SwitchType DEFAULT = SwitchType.ajax;
+}
Copied: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java (from rev 18768, trunk/core/impl/src/main/java/org/richfaces/component/util/FormUtil.java)
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java (rev 0)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -0,0 +1,53 @@
+/**
+ * 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.renderkit.util;
+
+import org.ajax4jsf.renderkit.RendererUtils;
+import org.richfaces.component.EnclosingFormRequiredException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+
+/**
+ * @author Filip Antonov - mailto:fantonov@exadel.com
+ * created 08.02.2007
+ */
+public final class FormUtil {
+ private FormUtil() {
+ }
+
+ public static void throwEnclFormReqExceptionIfNeed(FacesContext context, UIComponent component)
+ throws EnclosingFormRequiredException {
+
+ UIForm form = RendererUtils.getInstance().getNestingForm(context, component);
+
+ // TODO nick -> nick - switchType checking can be harmful here
+ String switchType = (String) component.getAttributes().get("switchType");
+ boolean isSwitchTypeClient = (switchType == null) ? false : switchType.equalsIgnoreCase("client");
+
+ if ((form == null) && !isSwitchTypeClient) {
+ throw new EnclosingFormRequiredException(component.getClass().toString() + " (id=\"" + component.getId()
+ + "\") did not find parent form.");
+ }
+ }
+}
Copied: trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java (from rev 18768, trunk/core/impl/src/test/java/org/richfaces/component/util/FormUtilTest.java)
===================================================================
--- trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java (rev 0)
+++ trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -0,0 +1,81 @@
+/**
+ * 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.renderkit.util;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIForm;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIViewRoot;
+
+import org.jboss.test.faces.AbstractFacesTest;
+import org.richfaces.component.EnclosingFormRequiredException;
+
+/**
+ * @author Nick Belaevski - nbelaevski(a)exadel.com
+ * created 11.04.2007
+ *
+ */
+public class FormUtilTest extends AbstractFacesTest {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ setupFacesRequest();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testThrowEnclFormReqExceptionIfNeed() throws Exception {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ UIComponent form = application.createComponent(UIForm.COMPONENT_TYPE);
+
+ viewRoot.getChildren().add(form);
+
+ UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
+
+ form.getChildren().add(testComponent);
+ FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
+ }
+
+ public void testThrowEnclFormReqExceptionIfNeedNoForm() throws Exception {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
+
+ viewRoot.getChildren().add(testComponent);
+
+ try {
+ FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
+ fail();
+ } catch (EnclosingFormRequiredException e) {}
+ }
+
+ public void testThrowEnclFormReqExceptionIfNeedClient() throws Exception {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ UIComponent testComponent = application.createComponent(UIOutput.COMPONENT_TYPE);
+
+ testComponent.getAttributes().put("switchType", "CLIENT");
+ viewRoot.getChildren().add(testComponent);
+ FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
+ }
+}
Deleted: trunk/ui/output/api/src/main/java/org/richfaces/component/SwitchType.java
===================================================================
--- trunk/ui/output/api/src/main/java/org/richfaces/component/SwitchType.java 2010-08-18 17:16:46 UTC (rev 18772)
+++ trunk/ui/output/api/src/main/java/org/richfaces/component/SwitchType.java 2010-08-18 17:24:07 UTC (rev 18773)
@@ -1,24 +0,0 @@
-package org.richfaces.component;
-
-/**
- * @author akolonitsky
- * @since Jun 15, 2010
- */
-public enum SwitchType {
- /**
- * value for tab change method for - client-side tabs.
- */
- client,
-
- /**
- * value for tab change method - server-side tabs
- */
- server,
-
- /**
- * value for tab change method - ajax tabs
- */
- ajax;
-
- public static final SwitchType DEFAULT = SwitchType.ajax;
-}
15 years, 9 months
JBoss Rich Faces SVN: r18772 - in trunk/ui/common: api/src/main/java/org and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-18 13:16:46 -0400 (Wed, 18 Aug 2010)
New Revision: 18772
Added:
trunk/ui/common/api/src/main/java/org/
trunk/ui/common/api/src/main/java/org/richfaces/
trunk/ui/common/api/src/main/java/org/richfaces/component/
trunk/ui/common/ui/src/main/java/org/
trunk/ui/common/ui/src/main/java/org/richfaces/
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/
Log:
RF-9010 TogglePanel improve diagnostic of "form not found" case
15 years, 9 months
JBoss Rich Faces SVN: r18771 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-18 13:09:51 -0400 (Wed, 18 Aug 2010)
New Revision: 18771
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java
Log:
following changes in richfaces-selenium library
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java 2010-08-18 17:09:17 UTC (rev 18770)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java 2010-08-18 17:09:51 UTC (rev 18771)
@@ -23,8 +23,8 @@
import org.jboss.test.selenium.locator.AbstractElementLocator;
import org.jboss.test.selenium.locator.CompoundableLocator;
+import org.jboss.test.selenium.locator.ElementLocationStrategy;
import org.jboss.test.selenium.locator.IterableLocator;
-import org.jboss.test.selenium.locator.type.LocationStrategy;
import org.jboss.test.selenium.utils.text.SimplifiedFormat;
/**
@@ -71,7 +71,7 @@
return getReferenced().getRawLocator();
}
- public LocationStrategy getLocationStrategy() {
+ public ElementLocationStrategy getLocationStrategy() {
return reference.getLocator().getLocationStrategy();
}
15 years, 9 months
JBoss Rich Faces SVN: r18770 - modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-18 13:09:17 -0400 (Wed, 18 Aug 2010)
New Revision: 18770
Modified:
modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java
Log:
removed redundant imports from same package (checkstyle error)
Modified: modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java
===================================================================
--- modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java 2010-08-18 17:08:39 UTC (rev 18769)
+++ modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TemplatesListTest.java 2010-08-18 17:09:17 UTC (rev 18770)
@@ -22,8 +22,6 @@
package org.richfaces.tests.metamer;
-import org.richfaces.tests.metamer.Template;
-import org.richfaces.tests.metamer.TemplatesList;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
15 years, 9 months
JBoss Rich Faces SVN: r18769 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-08-18 13:08:39 -0400 (Wed, 18 Aug 2010)
New Revision: 18769
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java
Log:
made class Attribute Serializable
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2010-08-18 17:03:36 UTC (rev 18768)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2010-08-18 17:08:39 UTC (rev 18769)
@@ -22,6 +22,7 @@
package org.richfaces.tests.metamer;
+import java.io.Serializable;
import java.util.List;
import javax.faces.model.SelectItem;
@@ -35,8 +36,9 @@
* @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a>
* @version $Revision$
*/
-public class Attribute {
-
+public class Attribute implements Serializable {
+ private static final long serialVersionUID = -6716974687380275186L;
+
private Logger logger;
private String name;
private Object value;
15 years, 9 months
JBoss Rich Faces SVN: r18768 - in sandbox/trunk/examples/richfaces-showcase-gae: src/main/webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-18 13:03:36 -0400 (Wed, 18 Aug 2010)
New Revision: 18768
Removed:
sandbox/trunk/examples/richfaces-showcase-gae/src/test/java/org/richfaces/examples/
Modified:
sandbox/trunk/examples/richfaces-showcase-gae/pom.xml
sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/appengine-web.xml
Log:
Commented out unnecessary dependencies in richfaces-showcase-gae
Modified: sandbox/trunk/examples/richfaces-showcase-gae/pom.xml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/pom.xml 2010-08-18 16:47:14 UTC (rev 18767)
+++ sandbox/trunk/examples/richfaces-showcase-gae/pom.xml 2010-08-18 17:03:36 UTC (rev 18768)
@@ -27,6 +27,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-labs</artifactId>
@@ -51,11 +52,25 @@
<version>${gae.version}</version>
<scope>test</scope>
</dependency>
+ -->
+ <!--app engine related dependencies -->
+ <!--
+ <dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-api-1.0-sdk</artifactId>
+ <version>${gae.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.appengine.orm</groupId>
+ <artifactId>datanucleus-appengine</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+ -->
<!--servlet and jsp api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -64,18 +79,7 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
- <!--app engine related dependencies -->
<dependency>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-api-1.0-sdk</artifactId>
- <version>${gae.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.appengine.orm</groupId>
- <artifactId>datanucleus-appengine</artifactId>
- <version>1.0.6</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
@@ -85,21 +89,6 @@
<artifactId>geronimo-jpa_3.0_spec</artifactId>
<version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>2.3-eb</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>1.1.5</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jpa</artifactId>
- <version>1.1.5</version>
- </dependency>
<!--jstl -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -107,11 +96,6 @@
<version>1.1.2</version>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.0.2</version>
@@ -121,15 +105,7 @@
<artifactId>jsf-impl</artifactId>
<version>2.0.2</version>
</dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.1</version>
@@ -140,11 +116,6 @@
<version>2.9.1</version>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
Modified: sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/appengine-web.xml
===================================================================
--- sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/appengine-web.xml 2010-08-18 16:47:14 UTC (rev 18767)
+++ sandbox/trunk/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/appengine-web.xml 2010-08-18 17:03:36 UTC (rev 18768)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>richfaces-showcase-gae</application>
- <version>9</version>
+ <version>10</version>
<sessions-enabled>true</sessions-enabled>
<system-properties>
15 years, 9 months
JBoss Rich Faces SVN: r18767 - in trunk: examples/output-demo/src/main/webapp/examples and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-08-18 12:47:14 -0400 (Wed, 18 Aug 2010)
New Revision: 18767
Modified:
trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
Log:
RF-9014 Toggle panel: active item cannot be an expression
Modified: trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
===================================================================
--- trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-18 16:22:19 UTC (rev 18766)
+++ trunk/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-18 16:47:14 UTC (rev 18767)
@@ -13,6 +13,8 @@
private String name;
+ private String value = "name2";
+
public TogglePanelBean() {
LOGGER.info("post construct: initialize");
name = "John";
@@ -26,6 +28,15 @@
this.name = name;
}
+ public String getValue() {
+ System.out.println("value = " + value);
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
public void itemChangeActionListener() {
LOGGER.info("TogglePanelBean.itemChangeActionListener");
}
Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 16:22:19 UTC (rev 18766)
+++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-08-18 16:47:14 UTC (rev 18767)
@@ -14,7 +14,7 @@
<ui:define name="body">
<f:view>
<h:form id="f">
- <pn:togglePanel id="panel" activeItem="name1" switchType="ajax"
+ <pn:togglePanel id="panel" activeItem="#{togglePanelBean.value}" switchType="ajax"
itemChangeListener="#{togglePanelBean.itemChangeActionListener}" >
<pn:togglePanelItem name="name1">hello name1</pn:togglePanelItem>
<pn:togglePanelItem name="name2">hello name2</pn:togglePanelItem>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-08-18 16:22:19 UTC (rev 18766)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-08-18 16:47:14 UTC (rev 18767)
@@ -537,6 +537,15 @@
setValue(value);
}
+ @Override
+ public void setValueExpression(String name, ValueExpression binding) {
+ if ("activeItem".equals(name)) {
+ super.setValueExpression("value", binding);
+ } else {
+ super.setValueExpression(name, binding);
+ }
+ }
+
public abstract SwitchType getSwitchType();
public abstract boolean isBypassUpdates();
15 years, 9 months
JBoss Rich Faces SVN: r18766 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-18 12:22:19 -0400 (Wed, 18 Aug 2010)
New Revision: 18766
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
Log:
https://jira.jboss.org/browse/RF-9058
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-18 16:15:57 UTC (rev 18765)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-18 16:22:19 UTC (rev 18766)
@@ -65,6 +65,7 @@
background: url("#{resource['org.richfaces.renderkit.html.images.InputBackgroundImage']}") top repeat-x #fff;
border: 1px inset #C0C0C0;
margin: 0px 10px 0px 10px;
+ vertical-align: bottom;
}
.rf-ins-tt {
15 years, 9 months
JBoss Rich Faces SVN: r18765 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-18 12:15:57 -0400 (Wed, 18 Aug 2010)
New Revision: 18765
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
Log:
https://jira.jboss.org/browse/RF-9057
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-18 15:41:53 UTC (rev 18764)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.ecss 2010-08-18 16:15:57 UTC (rev 18765)
@@ -82,15 +82,25 @@
height: 6px;
clear: both;
vertical-align: top;
+ /* outline style fix for chrome */
+ font-size: 0px;
}
-.rf-ins-h, .rf-ins-db, .rf-ins-ib, .rf-ins-h-d, .rf-ins-db-d, .rf-ins-ib-d {
+.rf-ins-h, .rf-ins-h-d, .rf-ins-db, .rf-ins-ib, .rf-ins-db-d, .rf-ins-ib-d {
display: inline-block;
width: 7px;
height: 7px;
+}
+
+.rf-ins-h, .rf-ins-h-d {
vertical-align: top;
}
+.rf-ins-db, .rf-ins-ib, .rf-ins-db-d, .rf-ins-ib-d {
+ vertical-align: bottom;
+}
+
+
.rf-ins-h {
background-image: url("#{resource['org.richfaces.renderkit.html.images.SliderArrowBottom']}");
}
15 years, 9 months
JBoss Rich Faces SVN: r18764 - trunk/ui/input/ui/src/main/config.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-08-18 11:41:53 -0400 (Wed, 18 Aug 2010)
New Revision: 18764
Modified:
trunk/ui/input/ui/src/main/config/faces-config.xml
Log:
https://jira.jboss.org/browse/RF-9055
Modified: trunk/ui/input/ui/src/main/config/faces-config.xml
===================================================================
--- trunk/ui/input/ui/src/main/config/faces-config.xml 2010-08-18 15:31:48 UTC (rev 18763)
+++ trunk/ui/input/ui/src/main/config/faces-config.xml 2010-08-18 15:41:53 UTC (rev 18764)
@@ -128,8 +128,8 @@
</property>
<property>
<property-name>maxValue</property-name>
- <property-class>java.lang.Number</property-class>
- <default-value>100</default-value>
+ <property-class>java.lang.String</property-class>
+ <default-value>"100"</default-value>
<property-extension>
<cdk:generate>true</cdk:generate>
</property-extension>
@@ -144,8 +144,8 @@
</property>
<property>
<property-name>minValue</property-name>
- <property-class>java.lang.Number</property-class>
- <default-value>0</default-value>
+ <property-class>java.lang.String</property-class>
+ <default-value>"0"</default-value>
<property-extension>
<cdk:generate>true</cdk:generate>
</property-extension>
@@ -184,8 +184,8 @@
</property>
<property>
<property-name>step</property-name>
- <property-class>java.lang.Number</property-class>
- <default-value>1</default-value>
+ <property-class>java.lang.String</property-class>
+ <default-value>"1"</default-value>
<property-extension>
<cdk:generate>true</cdk:generate>
</property-extension>
15 years, 9 months