12:27 p.m.
Author: nbelaevski
Date: 2010-05-13 13:27:36 -0400 (Thu, 13 May 2010)
New Revision: 17027
Modified:
root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java
Log:
https://jira.jboss.org/jira/browse/RF-8639
Modified: root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java
===================================================================
---
root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java 2010-05-13
16:54:13 UTC (rev 17026)
+++
root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java 2010-05-13
17:27:36 UTC (rev 17027)
@@ -21,7 +21,6 @@
*/
package org.richfaces.component;
-import javax.faces.context.PartialViewContext;
/**
* @author Nick Belaevski
@@ -31,5 +30,7 @@
public static final String META_COMPONENT_ID = "region";
- public static final String DEFAULT_RENDER_ID =
PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS;
+ public static final String META_CLIENT_ID =
MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + META_COMPONENT_ID;
+
+ public static final String DEFAULT_RENDER_ID = "@this";
}
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
===================================================================
---
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13
16:54:13 UTC (rev 17026)
+++
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13
17:27:36 UTC (rev 17027)
@@ -129,6 +129,11 @@
return metaComponentSubstitutions.get(metaComponentId);
}
+ //used in unit tests
+ static void setMetaComponentSubstitutions(Map<String, String> substitutionsMap)
{
+ metaComponentSubstitutions = substitutionsMap;
+ }
+
private String computeClientId(FacesContext context,
UIComponent topMatchComponent, String id) {
Modified:
root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java
===================================================================
---
root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java 2010-05-13
16:54:13 UTC (rev 17026)
+++
root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java 2010-05-13
17:27:36 UTC (rev 17027)
@@ -24,7 +24,7 @@
import javax.faces.component.UIComponent;
import org.ajax4jsf.component.AjaxClientBehavior;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.richfaces.component.AjaxContainer;
/**
* @author akolonitsky
@@ -33,7 +33,7 @@
class ExecuteComponentCallback extends ComponentCallback {
ExecuteComponentCallback(String behaviorEvent) {
- super(behaviorEvent, AjaxRendererUtils.THIS);
+ super(behaviorEvent, AjaxContainer.META_CLIENT_ID);
}
@Override
Modified:
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java
===================================================================
---
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2010-05-13
16:54:13 UTC (rev 17026)
+++
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2010-05-13
17:27:36 UTC (rev 17027)
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertEquals;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -37,6 +38,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.richfaces.component.MetaComponentResolver;
/**
* @author Nick Belaevski
@@ -44,6 +46,12 @@
*/
public class ComponentIdResolverTest {
+ static final String META_COMPONENT_ID = "testId";
+
+ static final String META_COMPONENT_ID_SUBSTITUTION = "@substitutedTestId";
+
+ private static final String META_CLIENT_ID =
MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + META_COMPONENT_ID;
+
private FacesEnvironment environment;
private FacesRequest facesRequest;
@@ -54,6 +62,9 @@
@Before
public void setUp() throws Exception {
+ ComponentIdResolver.setMetaComponentSubstitutions(
+ Collections.singletonMap(META_COMPONENT_ID,
META_COMPONENT_ID_SUBSTITUTION));
+
environment = FacesEnvironment.createEnvironment();
environment.withResource("/test.xhtml", getClass().getResource(
@@ -197,7 +208,7 @@
@Test
public void testFindViaMetadataResolverInContext() throws Exception {
ComponentIdResolver resolver = createComponentIdResolver();
- resolver.addId("@region");
+ resolver.addId(META_CLIENT_ID);
resolver.resolve(evaluateComponentExpression("#{testBean.outputInRegion}"));
@@ -208,12 +219,12 @@
@Test
public void testFindViaMetadataResolverOutContext() throws Exception {
ComponentIdResolver resolver = createComponentIdResolver();
- resolver.addId("@region");
+ resolver.addId(META_CLIENT_ID);
resolver.resolve(evaluateComponentExpression("#{testBean.outputOutRegion}"));
Set<String> resolvedIds = resolver.getResolvedIds();
- assertEquals(asSet("@all"), resolvedIds);
+ assertEquals(asSet(META_COMPONENT_ID_SUBSTITUTION), resolvedIds);
}
@Test
Modified:
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java
===================================================================
---
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java 2010-05-13
16:54:13 UTC (rev 17026)
+++
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java 2010-05-13
17:27:36 UTC (rev 17027)
@@ -36,7 +36,7 @@
private static class UIRegion extends UIComponentBase implements
MetaComponentResolver {
public String resolveClientId(FacesContext facesContext, UIComponent
contextComponent, String metaComponentId) {
- if ("region".equals(metaComponentId)) {
+ if (ComponentIdResolverTest.META_COMPONENT_ID.equals(metaComponentId)) {
return getClientId(facesContext);
}
return null;