[seam-commits] Seam SVN: r15458 - in branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui: util and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2013-03-18 09:14:04 -0400 (Mon, 18 Mar 2013)
New Revision: 15458

Modified:
   branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
   branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java
Log:
bz920625 calling getBookmarkableUrl instead of getActionUrl

Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java	2013-03-18 11:43:41 UTC (rev 15457)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java	2013-03-18 13:14:04 UTC (rev 15458)
@@ -103,12 +103,12 @@
          url.addParameter(uiPropagation);
       }
       
-      if (propagationType == PropagationType.NONE)
-      {
-         UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance();
-         uiPropagation.setType(getPropagation());         
-         url.addParameter(uiPropagation);
-      }
+//      if (propagationType == PropagationType.NONE)
+//      {
+//         UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance();
+//         uiPropagation.setType(getPropagation());         
+//         url.addParameter(uiPropagation);
+//      }
       
       if (getConversationName() != null)
       {

Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java	2013-03-18 11:43:41 UTC (rev 15457)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java	2013-03-18 13:14:04 UTC (rev 15458)
@@ -22,8 +22,7 @@
          throw new NullPointerException("viewId must not be null");
       }
       FacesContext facesContext = FacesContext.getCurrentInstance();
-      String url = facesContext.getApplication().getViewHandler().getActionURL(facesContext,
-               viewId);
+      String url = facesContext.getApplication().getViewHandler().getBookmarkableURL(facesContext, viewId, null, false);
       url = Pages.instance().encodeScheme(viewId, facesContext, url);
       setUrl(url);