JBoss Rich Faces SVN: r19465 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-06 04:08:50 -0400 (Wed, 06 Oct 2010)
New Revision: 19465
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
Log:
https://jira.jboss.org/browse/RF-9417
* a4j:ajax set to default event
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2010-10-06 07:40:48 UTC (rev 19464)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectBooleanCheckbox.xhtml 2010-10-06 08:08:50 UTC (rev 19465)
@@ -45,7 +45,6 @@
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
data="#{a4jAjaxBean.attributes['data'].value}"
disabled="#{a4jAjaxBean.attributes['disabled'].value}"
- event="change"
execute="#{a4jAjaxBean.attributes['execute'].value}"
immediate="#{a4jAjaxBean.attributes['immediate'].value}"
limitRender="#{a4jAjaxBean.attributes['limitRender'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-10-06 07:40:48 UTC (rev 19464)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectManyCheckbox.xhtml 2010-10-06 08:08:50 UTC (rev 19465)
@@ -51,7 +51,6 @@
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
data="#{a4jAjaxBean.attributes['data'].value}"
disabled="#{a4jAjaxBean.attributes['disabled'].value}"
- event="change"
execute="#{a4jAjaxBean.attributes['execute'].value}"
immediate="#{a4jAjaxBean.attributes['immediate'].value}"
limitRender="#{a4jAjaxBean.attributes['limitRender'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2010-10-06 07:40:48 UTC (rev 19464)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/hSelectOneRadio.xhtml 2010-10-06 08:08:50 UTC (rev 19465)
@@ -51,7 +51,6 @@
<a4j:ajax bypassUpdates="#{a4jAjaxBean.attributes['bypassUpdates'].value}"
data="#{a4jAjaxBean.attributes['data'].value}"
disabled="#{a4jAjaxBean.attributes['disabled'].value}"
- event="change"
execute="#{a4jAjaxBean.attributes['execute'].value}"
immediate="#{a4jAjaxBean.attributes['immediate'].value}"
limitRender="#{a4jAjaxBean.attributes['limitRender'].value}"
13 years, 11 months
JBoss Rich Faces SVN: r19464 - modules/tests/metamer/trunk/ftest.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-10-06 03:40:48 -0400 (Wed, 06 Oct 2010)
New Revision: 19464
Modified:
modules/tests/metamer/trunk/ftest/pom.xml
Log:
* project version reverted back to snapshot
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2010-10-06 05:48:52 UTC (rev 19463)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2010-10-06 07:40:48 UTC (rev 19464)
@@ -80,8 +80,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.0.0.20101004-M3</deployable.version>
- <ftest.source.version>4.0.0.20101004-M3</ftest.source.version>
+ <deployable.version>4.0.0-SNAPSHOT</deployable.version>
+ <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
</properties>
13 years, 11 months
JBoss Rich Faces SVN: r19463 - modules/docs/trunk/parent.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-10-06 01:48:52 -0400 (Wed, 06 Oct 2010)
New Revision: 19463
Modified:
modules/docs/trunk/parent/pom.xml
Log:
Updated styles version
Modified: modules/docs/trunk/parent/pom.xml
===================================================================
--- modules/docs/trunk/parent/pom.xml 2010-10-06 04:50:00 UTC (rev 19462)
+++ modules/docs/trunk/parent/pom.xml 2010-10-06 05:48:52 UTC (rev 19463)
@@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.pressgang</groupId>
- <artifactId>pressgang-xslt-ns</artifactId>
+ <artifactId>pressgang-xslt</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
13 years, 11 months
JBoss Rich Faces SVN: r19462 - modules/docs/trunk/parent.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-10-06 00:50:00 -0400 (Wed, 06 Oct 2010)
New Revision: 19462
Modified:
modules/docs/trunk/parent/pom.xml
Log:
Updated styles version
Modified: modules/docs/trunk/parent/pom.xml
===================================================================
--- modules/docs/trunk/parent/pom.xml 2010-10-06 00:09:40 UTC (rev 19461)
+++ modules/docs/trunk/parent/pom.xml 2010-10-06 04:50:00 UTC (rev 19462)
@@ -43,9 +43,9 @@
<extensions>true</extensions>
<dependencies>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt-ns</artifactId>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
13 years, 11 months
JBoss Rich Faces SVN: r19461 - branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-10-05 20:09:40 -0400 (Tue, 05 Oct 2010)
New Revision: 19461
Added:
branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ClientScriptLookupService.java
branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ScriptNotFoundException.java
Log:
CODING IN PROGRESS - issue RF-9219: CSV: development tests for server side(junit)
https://jira.jboss.org/browse/RF-9219
Added: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ClientScriptLookupService.java
===================================================================
--- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ClientScriptLookupService.java (rev 0)
+++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ClientScriptLookupService.java 2010-10-06 00:09:40 UTC (rev 19461)
@@ -0,0 +1,42 @@
+/*
+ * $Id$
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.validator;
+
+/**
+ * <p class="changed_added_4_0">This interface describes service that determines JavaScript module and function
+ * for Java corresponded version ( both Converter and Validator )</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public interface ClientScriptLookupService {
+
+ /**
+ * <p class="changed_added_4_0">Get description for client-side version of Java implementation</p>
+ * @param javaClass either Converter or Validator class.
+ * @return description of client-side script.
+ * @throws ScriptNotFoundException if no JavaScript code associated with Java class.
+ */
+ ClientScript getScript(Class<?> javaClass) throws ScriptNotFoundException;
+
+}
Property changes on: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ClientScriptLookupService.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ScriptNotFoundException.java
===================================================================
--- branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ScriptNotFoundException.java (rev 0)
+++ branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ScriptNotFoundException.java 2010-10-06 00:09:40 UTC (rev 19461)
@@ -0,0 +1,24 @@
+package org.richfaces.validator;
+
+public class ScriptNotFoundException extends Exception {
+
+ public ScriptNotFoundException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public ScriptNotFoundException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ScriptNotFoundException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public ScriptNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: branches/RF-8742/ui/validator/api/src/main/java/org/richfaces/validator/ScriptNotFoundException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 11 months
JBoss Rich Faces SVN: r19460 - branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-10-05 20:02:34 -0400 (Tue, 05 Oct 2010)
New Revision: 19460
Modified:
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
Log:
CODING IN PROGRESS - issue RF-9219: CSV: development tests for server side(junit)
https://jira.jboss.org/browse/RF-9219
Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-10-05 23:51:40 UTC (rev 19459)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-10-06 00:02:34 UTC (rev 19460)
@@ -44,6 +44,7 @@
@Override
public String getScript(ClientBehaviorContext behaviorContext) {
if (!(behaviorContext.getComponent() instanceof EditableValueHolder)) {
+ //TODO : implement form level validator for ActionSource components in next iteration , probably on M5 - RC1
throw new FacesException("Invalid target for client-side validator behavior");
}
return super.getScript(behaviorContext);
13 years, 11 months
JBoss Rich Faces SVN: r19459 - in branches/RF-8742/ui/validator: impl/src/test/java/org and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-10-05 19:51:40 -0400 (Tue, 05 Oct 2010)
New Revision: 19459
Added:
branches/RF-8742/ui/validator/impl/src/test/java/org/
branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/
branches/RF-8742/ui/validator/impl/src/test/java/org/richfaces/validator/
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ConverterNotFoundException.java
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/MessageNotFoundException.java
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ValidatorDescriptor.java
Modified:
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java
branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/ClientValidatorBehaviorTest.java
Log:
CODING IN PROGRESS - issue RF-9219: CSV: development tests for server side(junit)
https://jira.jboss.org/browse/RF-9219
Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java 2010-10-05 20:33:34 UTC (rev 19458)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -1,52 +1,35 @@
-/*
- * $Id$
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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 software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
package org.richfaces.component.behavior;
-import javax.faces.FacesException;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.behavior.ClientBehaviorBase;
+import java.util.Collection;
+
+import javax.faces.component.UIMessage;
import javax.faces.component.behavior.ClientBehaviorContext;
+import javax.faces.convert.Converter;
-/**
- * <p class="changed_added_4_0"></p>
- * @author asmirnov(a)exadel.com
- *
- */
-public class ClientValidatorBehavior extends ClientBehaviorBase {
+public interface ClientValidatorBehavior {
- @Override
- public String getScript(ClientBehaviorContext behaviorContext) {
- if (!(behaviorContext.getComponent() instanceof EditableValueHolder)) {
- throw new FacesException("Invalid target for client-side validator behavior");
- }
- return super.getScript(behaviorContext);
- }
/**
- * <p class="changed_added_4_0">This method looks up all {@link UIMessage} components associated with input for which this behavior belongs to</p>
+ * <p class="changed_added_4_0">
+ * This method looks up all {@link UIMessage} components associated with input for which this behavior belongs to
+ * </p>
+ *
* @param context
- * @return non-null collection of {@link UIMessage} components associated with terget input.
+ * @return non-null collection of {@link UIMessage} components associated with target input.
+ * @throws MessageNotFoundException
+ * if no {@link UIMessage} component points to target UIInput and no UIMessages found on page.
*/
-// public Collection<UIMessage> findMessages(ClientBehaviorContext context) {
-//
-// }
-}
+ Collection<UIMessage> findMessages(ClientBehaviorContext context) throws MessageNotFoundException;
+
+ /**
+ * <p class="changed_added_4_0">
+ * Look up for converter associated with target UIInput
+ * </p>
+ *
+ * @param context
+ * @return
+ */
+ Converter getConverter(ClientBehaviorContext context) throws ConverterNotFoundException;
+
+ Collection<ValidatorDescriptor> getValidators(ClientBehaviorContext context);
+
+}
\ No newline at end of file
Copied: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java (from rev 19442, branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorBehavior.java)
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java (rev 0)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -0,0 +1,72 @@
+/*
+ * $Id$
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.component.behavior;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.faces.FacesException;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIMessage;
+import javax.faces.component.behavior.ClientBehaviorBase;
+import javax.faces.component.behavior.ClientBehaviorContext;
+import javax.faces.convert.Converter;
+
+/**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class ClientValidatorImpl extends ClientBehaviorBase implements ClientValidatorBehavior {
+
+ @Override
+ public String getScript(ClientBehaviorContext behaviorContext) {
+ if (!(behaviorContext.getComponent() instanceof EditableValueHolder)) {
+ throw new FacesException("Invalid target for client-side validator behavior");
+ }
+ return super.getScript(behaviorContext);
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.component.behavior.ClientValidatorBehavior#findMessages(javax.faces.component.behavior.ClientBehaviorContext)
+ */
+ public Collection<UIMessage> findMessages(ClientBehaviorContext context) throws MessageNotFoundException {
+ return Collections.emptySet();
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.component.behavior.ClientValidatorBehavior#getConverter(javax.faces.component.behavior.ClientBehaviorContext)
+ */
+ public Converter getConverter(ClientBehaviorContext context) throws ConverterNotFoundException {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.component.behavior.ClientValidatorBehavior#getValidators(javax.faces.component.behavior.ClientBehaviorContext)
+ */
+ public Collection<ValidatorDescriptor> getValidators(ClientBehaviorContext context) {
+ return Collections.emptySet();
+ }
+}
Property changes on: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ConverterNotFoundException.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ConverterNotFoundException.java (rev 0)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ConverterNotFoundException.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -0,0 +1,69 @@
+/*
+ * $Id$
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.component.behavior;
+
+/**
+ * <p class="changed_added_4_0">This exception thrown if Client validator cannot determine Converter associated with target UIComponent</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+@SuppressWarnings("serial")
+public class ConverterNotFoundException extends Exception {
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ */
+ public ConverterNotFoundException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ */
+ public ConverterNotFoundException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param cause
+ */
+ public ConverterNotFoundException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ * @param cause
+ */
+ public ConverterNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ConverterNotFoundException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/MessageNotFoundException.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/MessageNotFoundException.java (rev 0)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/MessageNotFoundException.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -0,0 +1,69 @@
+/*
+ * $Id$
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.component.behavior;
+
+/**
+ * <p class="changed_added_4_0">This exception thrown if UIInput component associated with client side validator has no appropriate UIMessage(s)</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+@SuppressWarnings("serial")
+public class MessageNotFoundException extends Exception {
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ */
+ public MessageNotFoundException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ */
+ public MessageNotFoundException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param cause
+ */
+ public MessageNotFoundException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param message
+ * @param cause
+ */
+ public MessageNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/MessageNotFoundException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ValidatorDescriptor.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ValidatorDescriptor.java (rev 0)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ValidatorDescriptor.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -0,0 +1,42 @@
+package org.richfaces.component.behavior;
+
+import java.util.Map;
+
+/**
+ * <p class="changed_added_4_0">
+ * Inmlementations of this interface describe JSF or JSR-303 validators. Because JSF supports 2 types of validators,
+ * this interface unifies access to them.
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public interface ValidatorDescriptor {
+
+ /**
+ * <p class="changed_added_4_0">
+ * Returns JSF {@link javax.faces.validator.Validator} implementation class or JSR-303 annotation class.
+ * </p>
+ *
+ * @return
+ */
+ Class<?> getValidatorClass();
+
+ /**
+ * <p class="changed_added_4_0">
+ * Concrete validator parameters
+ * </p>
+ *
+ * @return non null map with validator instance parameters.
+ */
+ Map<String, Object> getValidatorParameters();
+
+ /**
+ * <p class="changed_added_4_0">
+ * Localized validator message
+ * </p>
+ *
+ * @return
+ */
+ String getMessage();
+}
Property changes on: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ValidatorDescriptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-10-05 20:33:34 UTC (rev 19458)
+++ branches/RF-8742/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -3,6 +3,8 @@
//
// Imports
//
+import javax.faces.component.behavior.ClientBehavior;
+import javax.faces.component.behavior.ClientBehaviorContext;
import javax.faces.render.ClientBehaviorRenderer;
/**
@@ -16,4 +18,9 @@
super();
}
+ @Override
+ public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) {
+ // TODO Auto-generated method stub
+ return super.getScript(behaviorContext, behavior);
+ }
}
Modified: branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/ClientValidatorBehaviorTest.java
===================================================================
--- branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/ClientValidatorBehaviorTest.java 2010-10-05 20:33:34 UTC (rev 19458)
+++ branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/component/behavior/ClientValidatorBehaviorTest.java 2010-10-05 23:51:40 UTC (rev 19459)
@@ -37,31 +37,31 @@
@RunWith(MockTestRunner.class)
public class ClientValidatorBehaviorTest {
- private static final String CLIENT_VALIDATION_FUNCTION = "rf.csv.v";
-
private final class DummyConverter implements Converter {
public String getAsString(FacesContext context, UIComponent component, Object value) {
return value.toString();
}
-
+
public Object getAsObject(FacesContext context, UIComponent component, String value) {
return value;
}
}
+ private static final String CLIENT_VALIDATION_FUNCTION = "rf.csv.v";
+
private static final String FORM_ID = "formId";
private static final String INPUT_ID = "inputId";
private static final String MESSAGE_ID = "messageId";
+ @Stub
+ protected UIOutput output;
+
@Mock()
@Environment({Feature.APPLICATION})
protected MockFacesEnvironment environment;
- @Stub
- private UIOutput output;
-
@Mock
protected UIInput input;
@@ -75,11 +75,11 @@
protected MockUIMessage message;
@Mock
- private ClientBehaviorContext behaviorContext;
+ protected ClientBehaviorContext behaviorContext;
protected MockController controller;
- private ClientValidatorBehavior behavior;
+ protected ClientValidatorImpl behavior;
@Before
public void setUp() {
@@ -166,8 +166,8 @@
// root.getChildren().add(form);
}
- private ClientValidatorBehavior createBehavior() {
- return new ClientValidatorBehavior();
+ private ClientValidatorImpl createBehavior() {
+ return new ClientValidatorImpl();
}
@Test
13 years, 11 months
JBoss Rich Faces SVN: r19458 - in branches/RF-8742/cdk: generator and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-10-05 16:33:34 -0400 (Tue, 05 Oct 2010)
New Revision: 19458
Modified:
branches/RF-8742/cdk/commons/pom.xml
branches/RF-8742/cdk/generator/pom.xml
branches/RF-8742/cdk/parent/pom.xml
Log:
RESOLVED - issue RF-9391: Possible memory leak in CDK
https://jira.jboss.org/browse/RF-9391
Modified: branches/RF-8742/cdk/commons/pom.xml
===================================================================
--- branches/RF-8742/cdk/commons/pom.xml 2010-10-05 16:03:16 UTC (rev 19457)
+++ branches/RF-8742/cdk/commons/pom.xml 2010-10-05 20:33:34 UTC (rev 19458)
@@ -1,12 +1,13 @@
<?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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.richfaces.cdk</groupId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.richfaces.cdk</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>commons</artifactId>
<version>4.0.0-SNAPSHOT</version>
@@ -32,19 +33,19 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.javaparser</groupId>
- <artifactId>javaparser</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
-
+ <groupId>com.google.code.javaparser</groupId>
+ <artifactId>javaparser</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: branches/RF-8742/cdk/generator/pom.xml
===================================================================
--- branches/RF-8742/cdk/generator/pom.xml 2010-10-05 16:03:16 UTC (rev 19457)
+++ branches/RF-8742/cdk/generator/pom.xml 2010-10-05 20:33:34 UTC (rev 19458)
@@ -1,11 +1,12 @@
<?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>parent</artifactId>
- <groupId>org.richfaces.cdk</groupId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
+<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>parent</artifactId>
+ <groupId>org.richfaces.cdk</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk</groupId>
<artifactId>generator</artifactId>
@@ -18,9 +19,9 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>guice-maven-plugin</artifactId>
- <!--<configuration>-->
- <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass>-->
- <!--</configuration>-->
+ <!--<configuration> -->
+ <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass> -->
+ <!--</configuration> -->
</plugin>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
@@ -56,12 +57,10 @@
<useSystemClassLoader>true</useSystemClassLoader>
</configuration>
</plugin>
- <!--
- plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId> <executions> <execution>
- <goals> <goal>xjc</goal> </goals> </execution> </executions>
- <configuration> <packageName>org.richfaces.cdk.model</packageName>
- </configuration> </plugin -->
+ <!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId>
+ <executions> <execution> <goals> <goal>xjc</goal> </goals> </execution> </executions>
+ <configuration> <packageName>org.richfaces.cdk.model</packageName> </configuration>
+ </plugin -->
</plugins>
<resources>
<resource>
@@ -77,10 +76,8 @@
</resources>
</build>
<dependencies>
- <!--
- <dependency> <groupId>org.apache.camel</groupId>
- <artifactId>camel-guice</artifactId> </dependency>
- -->
+ <!-- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-guice</artifactId>
+ </dependency> -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -124,17 +121,16 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
- <dependency>
- <!-- This must not be inherited from parent/bom it must be set to
- not be "provided" even though it is provided by container
- this is building a maven plugin that runs outside of container
- TODO A better place for this may be needed, cdk-parent/cdk-bom?
- -->
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
- </dependency>
<dependency>
+ <!-- This must not be inherited from parent/bom it must be set to not
+ be "provided" even though it is provided by container this is building a
+ maven plugin that runs outside of container TODO A better place for this
+ may be needed, cdk-parent/cdk-bom? -->
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
@@ -150,20 +146,17 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.w3c.css</groupId> <artifactId>sac</artifactId>
- <version>1.3</version> </dependency>
- -->
+ <!-- <dependency> <groupId>org.w3c.css</groupId> <artifactId>sac</artifactId>
+ <version>1.3</version> </dependency> -->
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
</dependency>
@@ -176,36 +169,19 @@
<artifactId>javaparser</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency> <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId> <version>1.0</version> </dependency>
- -->
+ <!-- <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId>
+ <version>1.0</version> </dependency> -->
- <!--
- <dependency> <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId> <version>1</version>
- </dependency>
- -->
+ <!-- <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId>
+ <version>1</version> </dependency> -->
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
</dependency>
+
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
- <!--
- <dependency> <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-grapher</artifactId> </dependency>
- -->
- <!--
- <dependency> <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-assisted-inject</artifactId> </dependency>
- --><!--
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- </dependency>
- --></dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Modified: branches/RF-8742/cdk/parent/pom.xml
===================================================================
--- branches/RF-8742/cdk/parent/pom.xml 2010-10-05 16:03:16 UTC (rev 19457)
+++ branches/RF-8742/cdk/parent/pom.xml 2010-10-05 20:33:34 UTC (rev 19458)
@@ -1,12 +1,13 @@
<?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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -91,9 +92,9 @@
<groupId>org.apache.camel</groupId>
<artifactId>guice-maven-plugin</artifactId>
<version>2.2.0</version>
- <!--<configuration>-->
- <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass>-->
- <!--</configuration>-->
+ <!--<configuration> -->
+ <!--<mainClass>mypackage.boot.camel.CamelStartup</mainClass> -->
+ <!--</configuration> -->
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -147,10 +148,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
</dependency>
+ -->
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
@@ -208,30 +216,30 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- Resources plugin dependencies -->
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.5-RC2_jboss-SP1</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>com.yahoo.platform.yui</groupId>
- <artifactId>yuicompressor</artifactId>
- <version>2.3.6</version>
- </dependency>
+ <!-- Resources plugin dependencies -->
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.5-RC2_jboss-SP1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.el</groupId>
+ <artifactId>el-ri</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yahoo.platform.yui</groupId>
+ <artifactId>yuicompressor</artifactId>
+ <version>2.3.6</version>
+ </dependency>
+
<!-- Tests -->
<dependency>
<groupId>junit</groupId>
13 years, 11 months
JBoss Rich Faces SVN: r19457 - in branches/RF-8992/ui/input: ui/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-10-05 12:03:16 -0400 (Tue, 05 Oct 2010)
New Revision: 19457
Modified:
branches/RF-8992/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java
branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java
branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js
Log:
support for the saveOnBlur attributes (https://jira.jboss.org/browse/RF-9347) , 'Tab' support for the inplaceSelect
Modified: branches/RF-8992/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java
===================================================================
--- branches/RF-8992/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2010-10-05 16:03:16 UTC (rev 19457)
@@ -9,6 +9,8 @@
public boolean isShowControls();
+ public boolean isSaveOnBlur();
+
public InplaceState getState();
}
Modified: branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-10-05 16:03:16 UTC (rev 19457)
@@ -49,6 +49,9 @@
@Attribute
public abstract String getDefaultLabel();
+ @Attribute(defaultValue="true")
+ public abstract boolean isSaveOnBlur();
+
@Attribute(defaultValue="InplaceState.ready")
public abstract InplaceState getState();
Modified: branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2010-10-05 16:03:16 UTC (rev 19457)
@@ -38,6 +38,9 @@
@Attribute
public abstract String getDefaultLabel();
+ @Attribute(defaultValue="true")
+ public abstract boolean isSaveOnBlur();
+
@Attribute(defaultValue="false")
public abstract boolean isShowControls();
Modified: branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-10-05 16:03:16 UTC (rev 19457)
@@ -77,6 +77,8 @@
public static final String OPTIONS_INITIAL_VALUE = "initialValue";
+ public static final String OPTIONS_SAVE_ON_BLUR = "saveOnBlur";
+
private static final Map<String, ComponentAttribute> INPLACEINPUT_HANDLER_ATTRIBUTES = Collections
.unmodifiableMap(ComponentAttribute.createMap(
@@ -189,6 +191,7 @@
options.put(OPTIONS_LABEL, clientId + ":label");
options.put(OPTIONS_FOCUS, clientId + ":focus");
options.put(OPTIONS_DEFAULT_LABEL, inplaceComponent.getDefaultLabel());
+ options.put(OPTIONS_SAVE_ON_BLUR, inplaceComponent.isSaveOnBlur());
boolean showControls = inplaceComponent.isShowControls();
Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-05 16:03:16 UTC (rev 19457)
@@ -34,11 +34,12 @@
this.changedCss = options.changedCss;
this.showControls = options.showControls;
this.defaultLabel = options.defaultLabel;
-
+
this.element = $(document.getElementById(id));
this.editContainer = $(document.getElementById(options.editContainer));
this.element.bind(this.editEvent, $.proxy(this.__editHandler, this));
+
if(this.showControls) {
this.okbtn = $(document.getElementById(options.okbtn));
this.cancelbtn = $(document.getElementById(options.cancelbtn));
@@ -93,13 +94,17 @@
isSaved = true;
+ this.__applyChangedStyles();
+ this.__hide();
+ },
+
+ __applyChangedStyles: function() {
if(this.isValueChanged()) {
this.element.addClass(this.changedCss);
} else {
this.element.removeClass(this.changedCss);
}
- this.__hide();
- },
+ },
cancel: function(){
var text = "";
@@ -115,6 +120,10 @@
return isSaved;
},
+ __saveValue: function(value) {
+
+ },
+
__show: function() {
this.scrollElements = rf.Event.bindScrollEventHandlers(this.id, this.__scrollHandler, this);
this.onshow();
Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-05 16:03:16 UTC (rev 19457)
@@ -11,6 +11,7 @@
var label = this.label.text();
var inputLabel = this.input.val();
this.initialValue = (label == inputLabel) ? label : "";
+ this.saveOnBlur = options.saveOnBlur;
this.input.bind("focus", $.proxy(this.__editHandler, this));
this.input.bind("change", $.proxy(this.__changeHandler, this));
@@ -49,8 +50,10 @@
},
__blurHandler: function(e) {
- if(!this.isValueSaved()) {
+ if(!this.isValueSaved() && this.__isSaveOnBlur()) {
this.save();
+ } else {
+ this.__hide();
}
return false;
},
@@ -60,6 +63,16 @@
this.save();
}
},
+
+ __isSaveOnBlur: function() {
+ return this.saveOnBlur;
+ },
+
+ __setInputFocus: function() {
+ this.input.unbind("focus", this.__editHandler);
+ this.input.focus();
+ this.input.bind("focus", $.proxy(this.__editHandler, this));
+ },
getValue: function() {
return this.input.val();
@@ -81,10 +94,8 @@
return (this.getValue() != this.initialValue);
},
- onshow: function(){
- this.input.unbind("focus", this.__editHandler);
- this.input.focus();
- this.input.bind("focus", $.proxy(this.__editHandler, this));
+ onshow: function(){
+ this.__setInputFocus();
},
onhide: function() {
Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2010-10-05 16:03:16 UTC (rev 19457)
@@ -12,7 +12,7 @@
}
.rf-is-none {
- display: none !important;
+ clip:rect(0px, 0px, 1px, 1px);
}
.insel_font {
Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-05 16:03:16 UTC (rev 19457)
@@ -36,6 +36,8 @@
if(!openPopup) {
openPopup = true;
}
+
+ $super.onshow.call(this);
},
onhide: function() {
@@ -51,7 +53,9 @@
var label = this.getItemLabel(key);
//inplace label
this.setValue(label);
- this.save();
+ this.select.hide();
+
+ this.__setInputFocus();
},
getItemValue: function(key) {
@@ -74,10 +78,19 @@
return item.label;
}
}
- },
+ },
- __blurHandler: function(e) {
- return false;
+ __blurHandler: function(e) {
+ var target = $(e.originalEvent.explicitOriginalTarget);
+ if(!this.__isPopupList(target)) {
+ $super.__blurHandler.call(this,e);
+ }
+ return false;
+ },
+
+ __isPopupList: function(target) {
+ var parentId = target.parents(".insel_list_cord").attr("id");
+ return (parentId && (parentId == this.select.__getId()));
}
}
Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js
===================================================================
--- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-10-05 15:59:16 UTC (rev 19456)
+++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/select.js 2010-10-05 16:03:16 UTC (rev 19457)
@@ -9,11 +9,11 @@
};
rf.ui.Select = function(id, listener, options) {
+ this.id = id;
this.select = $(document.getElementById(id));
this.itemsCord = $(document.getElementById(options.itemsCord));
this.selectItemCss = options.selectItemCss;
this.itemCss = options.itemCss;
- this.noneCss = options.noneCss;
this.selectListener = listener;
this.select.bind("blur", $.proxy(this.__blurHandler, this));
@@ -41,11 +41,11 @@
name : "select",
show: function() {
- this.select.removeClass(this.noneCss);
+ this.select.css("display", "");
},
hide: function() {
- this.select.addClass(this.noneCss);
+ this.select.css("display", "none");
},
processItem: function(event, element) {
@@ -80,6 +80,10 @@
}
return false;
},
+
+ __getId: function() {
+ return this.id;
+ }
}
})());
13 years, 11 months
JBoss Rich Faces SVN: r19456 - modules/tests/metamer/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-05 11:59:16 -0400 (Tue, 05 Oct 2010)
New Revision: 19456
Modified:
modules/tests/metamer/trunk/pom.xml
Log:
switching back richfaces snapshot version
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2010-10-05 14:04:24 UTC (rev 19455)
+++ modules/tests/metamer/trunk/pom.xml 2010-10-05 15:59:16 UTC (rev 19456)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.0.0.20101004-M3</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -106,7 +106,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.0.0.20101004-M3</version.richfaces>
+ <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
</properties>
<dependencyManagement>
13 years, 11 months