[seam-commits] Seam SVN: r9545 - in trunk/ui/src/main: java/org/jboss/seam/ui/component and 1 other directory.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-11-11 00:16:05 -0500 (Tue, 11 Nov 2008)
New Revision: 9545

Modified:
   trunk/ui/src/main/config/component/button.xml
   trunk/ui/src/main/config/component/link.xml
   trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
Log:
JBSEAM-3609

Modified: trunk/ui/src/main/config/component/button.xml
===================================================================
--- trunk/ui/src/main/config/component/button.xml	2008-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/config/component/button.xml	2008-11-11 05:16:05 UTC (rev 9545)
@@ -59,10 +59,16 @@
 			<classname>java.lang.Object</classname>
 			<description>Specify the task to operate on (e.g. for @StartTask)</description>
 		</property>
-        <property>
-            <name>conversationName</name>
-            <classname>java.lang.String</classname>
-            <description>The name of the conversation for natural conversations</description>
-        </property>
+    <property>
+        <name>conversationName</name>
+        <classname>java.lang.String</classname>
+        <description>The name of the conversation for natural conversations</description>
+    </property>
+    <property>
+        <name>includePageParams</name>
+        <classname>boolean</classname>
+        <description>Include page parameters defined in pages.xml when rendering the button</description>
+        <defaultvalue>true</defaultvalue>
+    </property>
 	</component>
 </components>

Modified: trunk/ui/src/main/config/component/link.xml
===================================================================
--- trunk/ui/src/main/config/component/link.xml	2008-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/config/component/link.xml	2008-11-11 05:16:05 UTC (rev 9545)
@@ -65,10 +65,16 @@
 			<classname>java.lang.Object</classname>
 			<description>Specify the task to operate on (e.g. for @StartTask)</description>
 		</property>
-        <property>
-            <name>conversationName</name>
-            <classname>java.lang.String</classname>
-            <description>The name of the conversation for natural conversations</description>
-        </property>
+    <property>
+        <name>conversationName</name>
+        <classname>java.lang.String</classname>
+        <description>The name of the conversation for natural conversations</description>
+    </property>
+    <property>
+        <name>includePageParams</name>
+        <classname>boolean</classname>
+        <description>Include page parameters defined in pages.xml when rendering the button</description>
+        <defaultvalue>true</defaultvalue>
+    </property>    
 	</component>
 </components>

Modified: trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java	2008-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java	2008-11-11 05:16:05 UTC (rev 9545)
@@ -57,7 +57,7 @@
          }
       }
 
-      if (viewId != null)
+      if (viewId != null && isIncludePageParams())
       {
          Map<String, Object> pageParameters = Pages.instance().getStringValuesFromModel(context, viewId, usedParameters);
          for (Map.Entry<String, Object> me : pageParameters.entrySet())
@@ -139,6 +139,10 @@
    public abstract void setConversationName(String name);
    
    public abstract String getConversationName();
+   
+   public abstract void setIncludePageParams(boolean value);
+   
+   public abstract boolean isIncludePageParams();
 
    public UISelection getSelection()
    {