Author: Alex.Kolonitsky
Date: 2010-08-18 14:29:00 -0400 (Wed, 18 Aug 2010)
New Revision: 18774
Modified:
trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java
trunk/ui/dist/richfaces-components-api/pom.xml
trunk/ui/dist/richfaces-components-ui/pom.xml
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
Log:
RF-9010 TogglePanel improve diagnostic of "form not found" case
Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java
===================================================================
--- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java 2010-08-18
17:24:07 UTC (rev 18773)
+++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/FormUtil.java 2010-08-18
18:29:00 UTC (rev 18774)
@@ -23,6 +23,7 @@
import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.EnclosingFormRequiredException;
+import org.richfaces.component.SwitchType;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
@@ -42,8 +43,8 @@
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");
+ SwitchType switchType = (SwitchType)
component.getAttributes().get("switchType");
+ boolean isSwitchTypeClient = (switchType != null) && SwitchType.client ==
switchType;
if ((form == null) && !isSwitchTypeClient) {
throw new EnclosingFormRequiredException(component.getClass().toString() +
" (id=\"" + component.getId()
Modified: trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java
===================================================================
---
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java 2010-08-18
17:24:07 UTC (rev 18773)
+++
trunk/ui/common/ui/src/test/java/org/richfaces/renderkit/util/FormUtilTest.java 2010-08-18
18:29:00 UTC (rev 18774)
@@ -28,6 +28,7 @@
import org.jboss.test.faces.AbstractFacesTest;
import org.richfaces.component.EnclosingFormRequiredException;
+import org.richfaces.component.SwitchType;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
@@ -74,7 +75,7 @@
UIViewRoot viewRoot = facesContext.getViewRoot();
UIComponent testComponent =
application.createComponent(UIOutput.COMPONENT_TYPE);
- testComponent.getAttributes().put("switchType", "CLIENT");
+ testComponent.getAttributes().put("switchType", SwitchType.client);
viewRoot.getChildren().add(testComponent);
FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, testComponent);
}
Modified: trunk/ui/dist/richfaces-components-api/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-18 17:24:07 UTC (rev 18773)
+++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-08-18 18:29:00 UTC (rev 18774)
@@ -152,7 +152,7 @@
<configuration>
<classifier>sources</classifier>
- <includeGroupIds>org.richfaces.ui.core,
org.richfaces.ui.iteration, org.richfaces.ui.output,
org.richfaces.ui.input</includeGroupIds>
+ <includeGroupIds>org.richfaces.ui.core,
org.richfaces.ui.common, org.richfaces.ui.iteration, org.richfaces.ui.output,
org.richfaces.ui.input</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-18 17:24:07 UTC (rev 18773)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-08-18 18:29:00 UTC (rev 18774)
@@ -176,7 +176,7 @@
<configuration>
<classifier>sources</classifier>
-
<includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc,
${assembly.projects.group}.iteration,
${assembly.projects.group}.output</includeGroupIds>
+
<includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.common,
${assembly.projects.group}.misc, ${assembly.projects.group}.iteration,
${assembly.projects.group}.output</includeGroupIds>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
<excludeTransitive>true</excludeTransitive>
</configuration>
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
===================================================================
---
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2010-08-18
17:24:07 UTC (rev 18773)
+++
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2010-08-18
18:29:00 UTC (rev 18774)
@@ -45,6 +45,7 @@
import org.richfaces.component.AbstractTogglePanel;
import org.richfaces.component.AbstractTogglePanelItem;
import org.richfaces.component.util.HtmlUtil;
+import org.richfaces.renderkit.util.FormUtil;
/**
* @author akolonitsky
@@ -105,6 +106,8 @@
@Override
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent
comp) throws IOException {
+ FormUtil.throwEnclFormReqExceptionIfNeed(context, comp);
+
super.doEncodeBegin(writer, context, comp);
AbstractTogglePanel panel = (AbstractTogglePanel) comp;
Show replies by date