Author: manaRH Date: 2011-02-04 05:30:50 -0500 (Fri, 04 Feb 2011) New Revision: 14038 Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java Log: JBSEAM-4774 - fixed set of conversation propagation types Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java 2011-01-31 14:05:09 UTC (rev 14037) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java 2011-02-04 10:30:50 UTC (rev 14038) @@ -7,6 +7,7 @@ */ public enum PropagationType { + DEFAULT, BEGIN, JOIN, NESTED, Modified: branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java =================================================================== --- branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2011-01-31 14:05:09 UTC (rev 14037) +++ branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2011-02-04 10:30:50 UTC (rev 14038) @@ -15,6 +15,7 @@ import javax.faces.event.ActionListener; import javax.faces.model.DataModel; +import org.jboss.seam.core.PropagationType; import org.jboss.seam.navigation.Pages; import org.jboss.seam.ui.util.ViewUrlBuilder; import org.jboss.seam.ui.util.cdk.MethodBindingToMethodExpression; @@ -77,16 +78,17 @@ url.addParameter(uiAction); } - if ("default".equals(getPropagation()) || "join".equals(getPropagation()) - || "nest".equals(getPropagation()) || "end".equals(getPropagation())) + PropagationType propagationType = PropagationType.valueOf(getPropagation()); + if (propagationType == PropagationType.DEFAULT || propagationType == PropagationType.JOIN || + propagationType == PropagationType.NESTED || propagationType == PropagationType.END) { UIConversationId uiConversationId = UIConversationId.newInstance(); uiConversationId.setViewId(viewId); url.addParameter(uiConversationId); } - - if ("join".equals(getPropagation()) || "nest".equals(getPropagation()) - || "begin".equals(getPropagation()) || "end".equals(getPropagation())) + + if (propagationType == PropagationType.JOIN || propagationType == PropagationType.NESTED || + propagationType == PropagationType.BEGIN || propagationType == PropagationType.END) { UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance(); uiPropagation.setType(getPropagation());