9:20 a.m.
Author: nbelaevski
Date: 2007-11-16 10:20:47 -0500 (Fri, 16 Nov 2007)
New Revision: 4039
Added:
branches/3.1.x/ui/componentControl/
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java
Removed:
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java
Modified:
branches/3.1.x/ui/componentControl/pom.xml
branches/3.1.x/ui/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-1357
Copied: branches/3.1.x/ui/componentControl (from rev 4037,
trunk/sandbox/ui/componentControl)
Modified: branches/3.1.x/ui/componentControl/pom.xml
===================================================================
--- trunk/sandbox/ui/componentControl/pom.xml 2007-11-16 14:33:49 UTC (rev 4037)
+++ branches/3.1.x/ui/componentControl/pom.xml 2007-11-16 15:20:47 UTC (rev 4039)
@@ -1,11 +1,11 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>ui</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
- <version>3.2.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>componentControl</artifactId>
<name>componentControl</name>
<build>
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -24,7 +24,7 @@
</executions>
<configuration>
<library>
- <prefix>org.richfaces.sandbox</prefix>
+ <prefix>org.richfaces</prefix>
<taglib>
<shortName>componentControl</shortName>
</taglib>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted:
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java
===================================================================
---
trunk/sandbox/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2007-11-16
14:33:49 UTC (rev 4037)
+++
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2007-11-16
15:20:47 UTC (rev 4039)
@@ -1,39 +0,0 @@
-package org.richfaces.renderkit;
-
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
-import org.richfaces.component.util.HtmlUtil;
-import org.richfaces.sandbox.component.UIComponentControl;
-
-
-public class ComponentControlRendererBase extends HeaderResourcesRendererBase {
-
- protected Class getComponentClass() {
- return UIComponentControl.class;
- }
-
- protected void checkValidity(String clientId, String name, String attachTiming, String
forAttr, String operation) {
-
- if ( ! "onload".equals(attachTiming) &&
- ! "immediate".equals(attachTiming) ) {
- throw new FacesException(
- "The attachTiming attribute of the controlComponent
(id='"+clientId+"') has an invalid value:'"+ attachTiming +
- "'. It may have only the following values: 'immediate',
'onload', 'onJScall'");
- }
-
- if (operation==null || "".equals(operation.trim())) {
- throw new FacesException(
- "The operation attribute of the controlComponent
(id='"+clientId+"') must be specified" );
- }
-
-
- }
-
- protected String replaceClientIds(FacesContext context, UIComponent component, String
selector) {
- return HtmlUtil.expandIdSelector(selector, component, context);
- }
-
-}
Copied:
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java
(from rev 4038,
trunk/sandbox/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java)
===================================================================
---
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java
(rev 0)
+++
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2007-11-16
15:20:47 UTC (rev 4039)
@@ -0,0 +1,39 @@
+package org.richfaces.renderkit;
+
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.richfaces.component.util.HtmlUtil;
+import org.richfaces.sandbox.component.UIComponentControl;
+
+
+public class ComponentControlRendererBase extends HeaderResourcesRendererBase {
+
+ protected Class getComponentClass() {
+ return UIComponentControl.class;
+ }
+
+ protected void checkValidity(String clientId, String name, String attachTiming, String
forAttr, String operation) {
+
+ if ( ! "onload".equals(attachTiming) &&
+ ! "immediate".equals(attachTiming) ) {
+ throw new FacesException(
+ "The attachTiming attribute of the controlComponent
(id='"+clientId+"') has an invalid value:'"+ attachTiming +
+ "'. It may have only the following values: 'immediate',
'onload', 'onJScall'");
+ }
+
+ if (operation==null || operation.trim().length() == 0) {
+ throw new FacesException(
+ "The operation attribute of the controlComponent
(id='"+clientId+"') must be specified" );
+ }
+
+
+ }
+
+ protected String replaceClientIds(FacesContext context, UIComponent component, String
selector) {
+ return HtmlUtil.expandIdSelector(selector, component, context);
+ }
+
+}
Modified: branches/3.1.x/ui/pom.xml
===================================================================
--- branches/3.1.x/ui/pom.xml 2007-11-16 15:15:43 UTC (rev 4038)
+++ branches/3.1.x/ui/pom.xml 2007-11-16 15:20:47 UTC (rev 4039)
@@ -88,6 +88,7 @@
<module>treeModel</module>
<module>message</module>
<module>scrollableDataTable</module>
+ <module>componentControl</module>
<module>insert</module>
</modules>
<dependencies>